diff options
Diffstat (limited to 'source/l')
| l--------- | source/l/libvisual-plugins | 1 | ||||
| -rw-r--r-- | source/l/libvisual-plugins/60_no-const-vispluginfo-in-nastyfft.patch | 18 | ||||
| -rw-r--r-- | source/l/libvisual-plugins/libvisual-plugins.gstreamer.diff | 73 | ||||
| -rwxr-xr-x | source/l/libvisual/libvisual-plugins.SlackBuild (renamed from source/l/libvisual-plugins/libvisual-plugins.SlackBuild) | 32 | ||||
| -rwxr-xr-x | source/l/libvisual/libvisual.SlackBuild | 30 | ||||
| -rw-r--r-- | source/l/libvisual/libvisual.glib.h.diff | 11 | ||||
| -rw-r--r-- | source/l/libvisual/libvisual.url | 1 | ||||
| -rw-r--r-- | source/l/libvisual/slack-desc | 2 | ||||
| -rw-r--r-- | source/l/libvisual/slack-desc.libvisual-plugins (renamed from source/l/libvisual-plugins/slack-desc) | 0 | ||||
| -rw-r--r-- | source/l/netpbm/netpbm-CAN-2005-2471.patch | 18 | ||||
| -rw-r--r-- | source/l/netpbm/netpbm-glibc.patch | 9 |
11 files changed, 57 insertions, 138 deletions
diff --git a/source/l/libvisual-plugins b/source/l/libvisual-plugins new file mode 120000 index 000000000..94e2b31e3 --- /dev/null +++ b/source/l/libvisual-plugins @@ -0,0 +1 @@ +libvisual
\ No newline at end of file diff --git a/source/l/libvisual-plugins/60_no-const-vispluginfo-in-nastyfft.patch b/source/l/libvisual-plugins/60_no-const-vispluginfo-in-nastyfft.patch deleted file mode 100644 index 8e54e02cb..000000000 --- a/source/l/libvisual-plugins/60_no-const-vispluginfo-in-nastyfft.patch +++ /dev/null @@ -1,18 +0,0 @@ -The static VisPluginInfo in nastyfft was declared as const, but libvisual write -to its refcount when it visual_object_unref()s it (nasty!). This is broken at -various levels: libvisual shouldn't be writing to this static plugin which is -allocated by a dlopen()ed plugin, and it should also honor the "const -VisPluginInfo" API... Anyway, nastyfft was the only occurrence and this fixes -the crash for now; LP: #287448. - ---- libvisual-plugins-0.4.0.dfsg.1.orig/plugins/actor/nastyfft/actor_nastyfft.c -+++ libvisual-plugins-0.4.0.dfsg.1/plugins/actor/nastyfft/actor_nastyfft.c -@@ -80,7 +80,7 @@ - .vidoptions.depth = VISUAL_VIDEO_DEPTH_GL - }}; - -- static const VisPluginInfo info[] = {{ -+ static VisPluginInfo info[] = {{ - .type = VISUAL_PLUGIN_TYPE_ACTOR, - - .plugname = N_("nastyfft"), diff --git a/source/l/libvisual-plugins/libvisual-plugins.gstreamer.diff b/source/l/libvisual-plugins/libvisual-plugins.gstreamer.diff deleted file mode 100644 index 060cef30b..000000000 --- a/source/l/libvisual-plugins/libvisual-plugins.gstreamer.diff +++ /dev/null @@ -1,73 +0,0 @@ ---- ./configure.orig 2006-03-20 12:48:36.000000000 -0600 -+++ ./configure 2008-09-12 00:08:19.000000000 -0500 -@@ -23466,11 +23466,11 @@ - if test "$HAVE_GTK" = "yes"; then - build_actor_plugins="$build_actor_plugins gdkpixbuf" - else -- { echo "$as_me:$LINENO: WARNING: *** GTK+ >= ${2.0} is not found. -+ { echo "$as_me:$LINENO: WARNING: *** GTK+ >= 2.0 is not found. - The libvisual GdkPixbuf image loader plugin won't be build. - GdkPixbuf is included within gtk-2.0 and newer, which can be - downloaded at http://www.gtk.org/" >&5 --echo "$as_me: WARNING: *** GTK+ >= ${2.0} is not found. -+echo "$as_me: WARNING: *** GTK+ >= 2.0 is not found. - The libvisual GdkPixbuf image loader plugin won't be build. - GdkPixbuf is included within gtk-2.0 and newer, which can be - downloaded at http://www.gtk.org/" >&2;} -@@ -23496,12 +23496,12 @@ - pkg_cv_GSTREAMER_CFLAGS="$GSTREAMER_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ -- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gstreamer-0.8 >= 0.8\"") >&5 -- ($PKG_CONFIG --exists --print-errors "gstreamer-0.8 >= 0.8") 2>&5 -+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gstreamer-0.10 >= 0.10\"") >&5 -+ ($PKG_CONFIG --exists --print-errors "gstreamer-0.10 >= 0.10") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then -- pkg_cv_GSTREAMER_CFLAGS=`$PKG_CONFIG --cflags "gstreamer-0.8 >= 0.8" 2>/dev/null` -+ pkg_cv_GSTREAMER_CFLAGS=`$PKG_CONFIG --cflags "gstreamer-0.10 >= 0.10" 2>/dev/null` - else - pkg_failed=yes - fi -@@ -23514,12 +23514,12 @@ - pkg_cv_GSTREAMER_LIBS="$GSTREAMER_LIBS" - else - if test -n "$PKG_CONFIG" && \ -- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gstreamer-0.8 >= 0.8\"") >&5 -- ($PKG_CONFIG --exists --print-errors "gstreamer-0.8 >= 0.8") 2>&5 -+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gstreamer-0.10 >= 0.10\"") >&5 -+ ($PKG_CONFIG --exists --print-errors "gstreamer-0.10 >= 0.10") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then -- pkg_cv_GSTREAMER_LIBS=`$PKG_CONFIG --libs "gstreamer-0.8 >= 0.8" 2>/dev/null` -+ pkg_cv_GSTREAMER_LIBS=`$PKG_CONFIG --libs "gstreamer-0.10 >= 0.10" 2>/dev/null` - else - pkg_failed=yes - fi -@@ -23538,9 +23538,9 @@ - _pkg_short_errors_supported=no - fi - if test $_pkg_short_errors_supported = yes; then -- GSTREAMER_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gstreamer-0.8 >= 0.8"` -+ GSTREAMER_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gstreamer-0.10 >= 0.10"` - else -- GSTREAMER_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gstreamer-0.8 >= 0.8"` -+ GSTREAMER_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gstreamer-0.10 >= 0.10"` - fi - # Put the nasty error message in config.log where it belongs - echo "$GSTREAMER_PKG_ERRORS" >&5 -@@ -23559,10 +23559,10 @@ - if test "$HAVE_GSTREAMER" = "yes"; then - build_actor_plugins="$build_actor_plugins gstreamer" - else -- { echo "$as_me:$LINENO: WARNING: *** GStreamer >= ${0.8} is not found. -+ { echo "$as_me:$LINENO: WARNING: *** GStreamer >= 0.10 is not found. - The libvisual GStreamer viewer plugin won't be build. - GStreamer can be downloaded from http://www.gstreamer.org/" >&5 --echo "$as_me: WARNING: *** GStreamer >= ${0.8} is not found. -+ echo "$as_me: WARNING: *** GStreamer >= 0.10 is not found. - The libvisual GStreamer viewer plugin won't be build. - GStreamer can be downloaded from http://www.gstreamer.org/" >&2;} - fi diff --git a/source/l/libvisual-plugins/libvisual-plugins.SlackBuild b/source/l/libvisual/libvisual-plugins.SlackBuild index 169ebdc79..74ed99ff7 100755 --- a/source/l/libvisual-plugins/libvisual-plugins.SlackBuild +++ b/source/l/libvisual/libvisual-plugins.SlackBuild @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright 2008, 2009, 2010, 2018, 2019, 2021 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2008, 2009, 2010, 2018, 2019, 2021, 2023 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,8 +23,9 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=libvisual-plugins -VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-7} +SRCNAM=libvisual +VERSION=${VERSION:-$(echo $SRCNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -66,9 +67,9 @@ rm -rf $PKG mkdir -p $PKG cd $TMP -rm -rf ${PKGNAM}-${VERSION} -tar xvf $CWD/${PKGNAM}-$VERSION.tar.?z* || exit 1 -cd ${PKGNAM}-$VERSION || exit 1 +rm -rf ${SRCNAM}-${VERSION} +tar xvf $CWD/${SRCNAM}-$VERSION.tar.?z || exit 1 +cd ${SRCNAM}-$VERSION/libvisual-plugins || exit 1 # Make sure ownerships and permissions are sane: chown -R root:root . @@ -78,14 +79,25 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \+ -zcat $CWD/libvisual-plugins.gstreamer.diff.gz | patch -p1 --verbose || exit 1 -zcat $CWD/60_no-const-vispluginfo-in-nastyfft.patch.gz | patch -p1 --verbose || exit 1 - # Configure: +if [ ! -r configure ]; then + if [ -x ./autogen.sh ]; then + NOCONFIGURE=1 ./autogen.sh + else + autoreconf -vif + fi +fi CFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --docdir=/usr/doc/$PKGNAM-$VERSION \ + --mandir=/usr/man \ + --infodir=/usr/info \ + --disable-static \ --disable-corona \ --disable-gforce \ --build=$ARCH-slackware-linux || exit 1 @@ -120,7 +132,7 @@ cp -a \ $PKG/usr/doc/${PKGNAM}-$VERSION mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc +cat $CWD/slack-desc.libvisual-plugins > $PKG/install/slack-desc cd $TMP/package-${PKGNAM} /sbin/makepkg -l y -c n $TMP/${PKGNAM}-$VERSION-$ARCH-$BUILD.txz diff --git a/source/l/libvisual/libvisual.SlackBuild b/source/l/libvisual/libvisual.SlackBuild index fc8cf114f..d25f6aa58 100755 --- a/source/l/libvisual/libvisual.SlackBuild +++ b/source/l/libvisual/libvisual.SlackBuild @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright 2006, 2008, 2009, 2010, 2012, 2018 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2006, 2008, 2009, 2010, 2012, 2018, 2023 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,8 +23,8 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=libvisual -VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-6} +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -67,10 +67,8 @@ fi cd $TMP rm -rf ${PKGNAM}-${VERSION} -tar xvf $CWD/${PKGNAM}-$VERSION.tar.?z* || exit 1 -cd ${PKGNAM}-$VERSION || exit 1 - -zcat $CWD/libvisual.glib.h.diff.gz | patch -p1 --verbose || exit 1 +tar xvf $CWD/${PKGNAM}-$VERSION.tar.?z || exit 1 +cd ${PKGNAM}-$VERSION/libvisual || exit 1 # Make sure ownerships and permissions are sane: chown -R root:root . @@ -80,12 +78,26 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \+ -# Configure: +# Configure, build, and install: +if [ ! -r configure ]; then + if [ -x ./autogen.sh ]; then + NOCONFIGURE=1 ./autogen.sh + else + autoreconf -vif + fi +fi CFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ - $ARCH-slackware-linux || exit 1 + --sysconfdir=/etc \ + --localstatedir=/var \ + --docdir=/usr/doc/$PKGNAM-$VERSION \ + --mandir=/usr/man \ + --infodir=/usr/info \ + --disable-static \ + --build=$ARCH-slackware-linux || exit 1 # Build and install: make $NUMJOBS || make || exit 1 diff --git a/source/l/libvisual/libvisual.glib.h.diff b/source/l/libvisual/libvisual.glib.h.diff deleted file mode 100644 index d0c738aac..000000000 --- a/source/l/libvisual/libvisual.glib.h.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- ./libvisual/lv_thread.h.orig 2005-09-18 17:14:47.000000000 -0500 -+++ ./libvisual/lv_thread.h 2012-07-17 23:05:48.818091848 -0500 -@@ -14,7 +14,7 @@ - #ifdef VISUAL_THREAD_MODEL_POSIX - #include <pthread.h> - #elif defined(VISUAL_THREAD_MODEL_GTHREAD2) /* !VISUAL_THREAD_MODEL_POSIX */ --#include <glib/gthread.h> -+#include <glib.h> - #else /* !VISUAL_THREAD_MODEL_GTHREAD2 */ - - #endif diff --git a/source/l/libvisual/libvisual.url b/source/l/libvisual/libvisual.url new file mode 100644 index 000000000..049899667 --- /dev/null +++ b/source/l/libvisual/libvisual.url @@ -0,0 +1 @@ +https://github.com/Libvisual/libvisual diff --git a/source/l/libvisual/slack-desc b/source/l/libvisual/slack-desc index c185b0230..d87df0e38 100644 --- a/source/l/libvisual/slack-desc +++ b/source/l/libvisual/slack-desc @@ -15,5 +15,5 @@ libvisual: make use of all the plugins that are written for libvisual. libvisual: Libvisual also contains a whole set of facilities to ease the libvisual: development of plugins. libvisual: -libvisual: Libvisual was written by Dennis Smit. +libvisual: Homepage: http://libvisual.org libvisual: diff --git a/source/l/libvisual-plugins/slack-desc b/source/l/libvisual/slack-desc.libvisual-plugins index 19fbcf01f..19fbcf01f 100644 --- a/source/l/libvisual-plugins/slack-desc +++ b/source/l/libvisual/slack-desc.libvisual-plugins diff --git a/source/l/netpbm/netpbm-CAN-2005-2471.patch b/source/l/netpbm/netpbm-CAN-2005-2471.patch index 77a3cd769..5e4b8baba 100644 --- a/source/l/netpbm/netpbm-CAN-2005-2471.patch +++ b/source/l/netpbm/netpbm-CAN-2005-2471.patch @@ -1,17 +1,11 @@ -diff --git a/converter/other/pstopnm.c b/converter/other/pstopnm.c -index f534265..2ab48ab 100644 ---- a/converter/other/pstopnm.c -+++ b/converter/other/pstopnm.c -@@ -896,11 +896,11 @@ execGhostscript(int const inputPipeFd, - ghostscriptProg, arg0, - deviceopt, outfileopt, gopt, ropt, textalphabitsopt, - "-q", "-dNOPAUSE", -- "-dSAFER", "-"); -+ "-dPARANOIDSAFER", "-"); +--- ./converter/other/pstopnm.c.orig 2023-12-29 13:47:21.000000000 -0600 ++++ ./converter/other/pstopnm.c 2023-12-29 13:50:33.241915523 -0600 +@@ -899,8 +899,8 @@ + "-dSAFER", "-"); } -- execl(ghostscriptProg, arg0, deviceopt, outfileopt, gopt, ropt, -- textalphabitsopt, "-q", "-dNOPAUSE", "-dSAFER", "-", NULL); +- execl(ghostscriptProg, arg0, deviceopt, outfileopt, gopt, ropt, +- textalphabitsopt, "-q", "-dNOPAUSE", "-dSAFER", "-", NULL); + execl(ghostscriptProg, arg0, deviceopt, outfileopt, gopt, ropt, "-q", + "-dNOPAUSE", "-dPARANOIDSAFER", "-", NULL); diff --git a/source/l/netpbm/netpbm-glibc.patch b/source/l/netpbm/netpbm-glibc.patch index 4ae71e8da..01e5cbc0b 100644 --- a/source/l/netpbm/netpbm-glibc.patch +++ b/source/l/netpbm/netpbm-glibc.patch @@ -1,13 +1,14 @@ ---- netpbm-10.35/converter/other/pnmtotiffcmyk.c.glibc 2006-09-18 12:20:06.000000000 +0200 -+++ netpbm-10.35/converter/other/pnmtotiffcmyk.c 2007-08-23 09:18:30.000000000 +0200 -@@ -974,8 +974,8 @@ int main( int argc, char **argv ) { +--- ./converter/other/pnmtotiffcmyk.c.orig 2023-12-29 13:47:21.000000000 -0600 ++++ ./converter/other/pnmtotiffcmyk.c 2023-12-29 13:55:43.849898342 -0600 +@@ -989,8 +989,9 @@ if ( (err = parseOpts( argc, argv, rt )) ) goto exit ; - + - if ( (err = rt->in->open( rt->in, rt )) ) goto exit ; - if ( (err = rt->out->open( rt->out, rt )) ) goto exit ; + if ( (err = (rt->in->open)( rt->in, rt )) ) goto exit ; + if ( (err = (rt->out->open)( rt->out, rt )) ) goto exit ; ++ while ( rt->in->hasMore( rt->in ) ) { if ( (err = rt->in->next( rt->in, &r, &g, &b )) ) goto exit ; |