diff options
Diffstat (limited to 'multimedia/aegisub')
-rw-r--r-- | multimedia/aegisub/README | 4 | ||||
-rw-r--r-- | multimedia/aegisub/aegisub.SlackBuild | 44 | ||||
-rw-r--r-- | multimedia/aegisub/aegisub.info | 10 | ||||
-rw-r--r-- | multimedia/aegisub/boost-1.81.0.patch | 56 | ||||
-rw-r--r-- | multimedia/aegisub/slack-desc | 4 |
5 files changed, 89 insertions, 29 deletions
diff --git a/multimedia/aegisub/README b/multimedia/aegisub/README index 8abce30271..267d701606 100644 --- a/multimedia/aegisub/README +++ b/multimedia/aegisub/README @@ -1,3 +1,3 @@ -A general-purpose subtitle editor with ASS/SSA support +A general-purpose subtitle editor -Optional dependencies: PulseAudio, OpenAL, and PortAudio +Optional dependency: portaudio diff --git a/multimedia/aegisub/aegisub.SlackBuild b/multimedia/aegisub/aegisub.SlackBuild index 0bdf6b18bb..333ac97d46 100644 --- a/multimedia/aegisub/aegisub.SlackBuild +++ b/multimedia/aegisub/aegisub.SlackBuild @@ -1,6 +1,6 @@ -#!/bin/sh +#!/bin/bash -# Copyright 2014-2017 Willy Sudiarto Raharjo <willysr@slackbuilds.org> +# Copyright 2014-2023 Willy Sudiarto Raharjo <willysr@slackbuilds.org> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -20,12 +20,14 @@ # OTHERWISE) ARISING IN ANY WAY OUTPUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +cd $(dirname $0) ; CWD=$(pwd) + PRGNAM=aegisub -VERSION=${VERSION:-3.2.2} +SRCNAM=Aegisub +VERSION=${VERSION:-3.3.3} BUILD=${BUILD:-2} TAG=${TAG:-_SBo} - -MVER=3.2 +PKGTYPE=${PKGTYPE:-tgz} if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -35,7 +37,11 @@ if [ -z "$ARCH" ]; then esac fi -CWD=$(pwd) +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" + exit 0 +fi + TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} @@ -59,21 +65,25 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.xz -cd $PRGNAM-$VERSION +rm -rf $SRCNAM-$VERSION +tar xvf $CWD/$SRCNAM-$VERSION.tar.gz +cd $SRCNAM-$VERSION chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ + -o -perm 511 \) -exec chmod 755 {} \+ -o \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+ -sed 's/$(LIBS_BOOST) $(LIBS_ICU)/$(LIBS_BOOST) $(LIBS_ICU) -pthread/' -i tools/Makefile +# Patch for current +patch -p1 < $CWD/boost-1.81.0.patch +autoreconf -fiv LDFLAGS="$LDFLAGS -lz" \ CFLAGS="$SLKCFLAGS" \ +CPPFLAGS+=' -DU_USING_ICU_NAMESPACE=1' \ CXXFLAGS="$SLKCFLAGS" \ +FORCE_GIT_VERSION="TRUE" \ ./configure \ --prefix=/usr \ --docdir=/usr/doc/$PRGNAM-$VERSION \ @@ -82,22 +92,16 @@ CXXFLAGS="$SLKCFLAGS" \ make make install DESTDIR=$PKG -ln -s $PRGNAM-$MVER $PKG/usr/bin/$PRGNAM - find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true -rm -f $PKG/usr/bin/aegisub -( - cd $PKG/usr/bin - ln -s aegisub-$MVER aegisub -) mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a README.md LICENCE $PKG/usr/doc/$PRGNAM-$VERSION +cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cat $CWD/doinst.sh > $PKG/install/doinst.sh cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-${VERSION}-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/multimedia/aegisub/aegisub.info b/multimedia/aegisub/aegisub.info index a1c1451829..2f11f77bec 100644 --- a/multimedia/aegisub/aegisub.info +++ b/multimedia/aegisub/aegisub.info @@ -1,10 +1,10 @@ PRGNAM="aegisub" -VERSION="3.2.2" -HOMEPAGE="http://www.aegisub.org/" -DOWNLOAD="http://ftp.aegisub.org/pub/archives/releases/source/aegisub-3.2.2.tar.xz" -MD5SUM="d80e852c34811add358c06d77f5cd40d" +VERSION="3.3.3" +HOMEPAGE="https://github.com/wangqr/Aegisub/" +DOWNLOAD="https://github.com/wangqr/Aegisub/archive/v3.3.3/Aegisub-3.3.3.tar.gz" +MD5SUM="08d7750b8b7732b790e9756ca3195baf" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="libass lua ffms2 wxGTK3" +REQUIRES="libass lua ffms2 wxGTK3 libuchardet" MAINTAINER="Willy Sudiarto Raharjo" EMAIL="willysr@slackbuilds.org" diff --git a/multimedia/aegisub/boost-1.81.0.patch b/multimedia/aegisub/boost-1.81.0.patch new file mode 100644 index 0000000000..ac264bc706 --- /dev/null +++ b/multimedia/aegisub/boost-1.81.0.patch @@ -0,0 +1,56 @@ +diff --git a/libaegisub/include/libaegisub/lua/utils.h b/libaegisub/include/libaegisub/lua/utils.h +index c5a65d6e4..f4921d582 100644 +--- a/libaegisub/include/libaegisub/lua/utils.h ++++ b/libaegisub/include/libaegisub/lua/utils.h +@@ -87,7 +87,10 @@ int exception_wrapper(lua_State *L) { + + template<typename T> + void set_field(lua_State *L, const char *name, T value) { +- push_value(L, value); ++ if constexpr(std::is_convertible<T, std::string>::value) ++ push_value(L, static_cast<std::string>(value)); ++ else ++ push_value(L, value); + lua_setfield(L, -2, name); + } + +diff --git a/src/auto4_lua.cpp b/src/auto4_lua.cpp +index 245689679..6d479b2c3 100644 +--- a/src/auto4_lua.cpp ++++ b/src/auto4_lua.cpp +@@ -115,7 +115,8 @@ namespace { + int get_translation(lua_State *L) + { + wxString str(check_wxstring(L, 1)); +- push_value(L, _(str).utf8_str()); ++ const char* val = static_cast<const char*>( _(str).utf8_str()); ++ push_value(L, val); + return 1; + } + +diff --git a/src/command/video.cpp b/src/command/video.cpp +index fb2bcb0ba..77e3e9ca7 100644 +--- a/src/command/video.cpp ++++ b/src/command/video.cpp +@@ -475,7 +475,7 @@ static void save_snapshot(agi::Context *c, bool raw) { + // If where ever that is isn't defined, we can't save there + if ((basepath == "\\") || (basepath == "/")) { + // So save to the current user's home dir instead +- basepath = wxGetHomeDir().c_str(); ++ basepath = static_cast<const char*>(wxGetHomeDir().c_str()); + } + } + // Actual fixed (possibly relative) path, decode it +diff --git a/src/dialog_attachments.cpp b/src/dialog_attachments.cpp +index 38ff53027..e30339f81 100644 +--- a/src/dialog_attachments.cpp ++++ b/src/dialog_attachments.cpp +@@ -161,7 +161,7 @@ void DialogAttachments::OnExtract(wxCommandEvent &) { + + // Multiple or single? + if (listView->GetNextSelected(i) != -1) +- path = wxDirSelector(_("Select the path to save the files to:"), to_wx(OPT_GET("Path/Fonts Collector Destination")->GetString())).c_str(); ++ path = static_cast<const char*>(wxDirSelector(_("Select the path to save the files to:"), to_wx(OPT_GET("Path/Fonts Collector Destination")->GetString())).c_str()); + else { + path = SaveFileSelector( + _("Select the path to save the file to:"), diff --git a/multimedia/aegisub/slack-desc b/multimedia/aegisub/slack-desc index 053d304d0a..a29184e5ba 100644 --- a/multimedia/aegisub/slack-desc +++ b/multimedia/aegisub/slack-desc @@ -8,10 +8,10 @@ |-----handy-ruler------------------------------------------------------| aegisub: aegisub (General-purpose subtitle editor) aegisub: -aegisub: A general-purpose subtitle editor with ASS/SSA support +aegisub: A general-purpose subtitle editor aegisub: aegisub: -aegisub: Project Site: https://code.google.com/p/aegisub/ +aegisub: Project Site: https://github.com/wangqr/Aegisub aegisub: aegisub: aegisub: |