summaryrefslogtreecommitdiffstats
path: root/multimedia
diff options
context:
space:
mode:
Diffstat (limited to 'multimedia')
-rw-r--r--multimedia/2ManDVD/2ManDVD.SlackBuild2
-rw-r--r--multimedia/2ManDVD/2ManDVD.info8
-rw-r--r--multimedia/2ManDVD/README2
-rw-r--r--multimedia/LiVES/LiVES.SlackBuild3
-rw-r--r--multimedia/avidemux/avidemux-2.5.1-i18n.patch42
-rw-r--r--multimedia/avidemux/avidemux.SlackBuild32
-rw-r--r--multimedia/avidemux/avidemux.info6
-rw-r--r--multimedia/dirac/dirac-force-int-comparison.patch21
-rw-r--r--multimedia/dirac/dirac.SlackBuild4
-rw-r--r--multimedia/dvgrab/dvgrab.SlackBuild6
-rw-r--r--multimedia/gpac/gpac.SlackBuild21
-rw-r--r--multimedia/gpac/gpac.info8
-rw-r--r--multimedia/gpac/libpng-infopp-null.patch11
-rw-r--r--multimedia/gst-ffmpeg/gst-ffmpeg.SlackBuild2
-rw-r--r--multimedia/gst-ffmpeg/gst-ffmpeg.info8
-rw-r--r--multimedia/gst-plugins-bad/gst-plugins-bad.SlackBuild2
-rw-r--r--multimedia/gst-plugins-bad/gst-plugins-bad.info8
-rw-r--r--multimedia/gst-plugins-ugly/gst-plugins-ugly.SlackBuild2
-rw-r--r--multimedia/gst-plugins-ugly/gst-plugins-ugly.info8
-rw-r--r--multimedia/mjpegtools/mjpegtools.SlackBuild6
-rw-r--r--multimedia/mpgtx/mpgtx.SlackBuild32
-rw-r--r--multimedia/mpgtx/patches/mpgtx-1.3.1-configure.patch69
-rw-r--r--multimedia/mpgtx/patches/mpgtx-1.3.1-dont-ignore-cxx-flags.patch12
23 files changed, 191 insertions, 124 deletions
diff --git a/multimedia/2ManDVD/2ManDVD.SlackBuild b/multimedia/2ManDVD/2ManDVD.SlackBuild
index 6c9d3f79e2..93f0e900c7 100644
--- a/multimedia/2ManDVD/2ManDVD.SlackBuild
+++ b/multimedia/2ManDVD/2ManDVD.SlackBuild
@@ -7,7 +7,7 @@
# Modified by the slackbuilds.org project.
PRGNAM=2ManDVD
-VERSION=${VERSION:-1.3.5}
+VERSION=${VERSION:-1.5.3}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
diff --git a/multimedia/2ManDVD/2ManDVD.info b/multimedia/2ManDVD/2ManDVD.info
index faed09e575..8bc6e17c99 100644
--- a/multimedia/2ManDVD/2ManDVD.info
+++ b/multimedia/2ManDVD/2ManDVD.info
@@ -1,10 +1,10 @@
PRGNAM="2ManDVD"
-VERSION="1.3.5"
+VERSION="1.5.3"
HOMEPAGE="http://2mandvd.tuxfamily.org/"
-DOWNLOAD="http://mirrors.kernel.org/gentoo/distfiles/2ManDVD-1.3.5.tar.gz"
-MD5SUM="864cd202972e233383ecbdb0d9a08a71"
+DOWNLOAD="http://ponce.cc/slackware/sources/repo/2ManDVD-1.5.3.tar.gz"
+MD5SUM="87b00a3cdafd3d360da89c390181acc2"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
MAINTAINER="ponce"
EMAIL="matteo.bernardini@gmail.com"
-APPROVED="rworkman"
+APPROVED=""
diff --git a/multimedia/2ManDVD/README b/multimedia/2ManDVD/README
index 1273c3e822..d268353888 100644
--- a/multimedia/2ManDVD/README
+++ b/multimedia/2ManDVD/README
@@ -5,5 +5,5 @@ written for qt4 and webkit.
for a faster gui the author suggests try launching it from command line
with option "-graphicssystem raster" or "-graphicssystem opengl"
-This requires webkit, ffmpeg, transcode, dvdauthor, mjpegtools, and
+This requires ffmpeg, transcode, dvdauthor, exif, mjpegtools and
ffmpegthumbnailer.
diff --git a/multimedia/LiVES/LiVES.SlackBuild b/multimedia/LiVES/LiVES.SlackBuild
index 15326cda85..1f7510e6ae 100644
--- a/multimedia/LiVES/LiVES.SlackBuild
+++ b/multimedia/LiVES/LiVES.SlackBuild
@@ -63,6 +63,9 @@ CFLAGS="$SLKCFLAGS" \
make docdir=/usr/doc/$PRGNAM-$VERSION
make install-strip docdir=/usr/doc/$PRGNAM-$VERSION DESTDIR=$PKG
+# fix link to lives exec
+( cd $PKG/usr/bin ; rm lives ; ln -s lives-exe lives )
+
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
cp -a COPYING INSTALL NEWS $PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
diff --git a/multimedia/avidemux/avidemux-2.5.1-i18n.patch b/multimedia/avidemux/avidemux-2.5.1-i18n.patch
deleted file mode 100644
index 956bbd1921..0000000000
--- a/multimedia/avidemux/avidemux-2.5.1-i18n.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff --git a/avidemux/ADM_userInterfaces/ADM_QT4/ui_support.cpp b/avidemux/ADM_userInterfaces/ADM_QT4/ui_support.cpp
-index 4cce636..b875528 100644
---- a/avidemux/ADM_userInterfaces/ADM_QT4/ui_support.cpp
-+++ b/avidemux/ADM_userInterfaces/ADM_QT4/ui_support.cpp
-@@ -73,7 +73,7 @@ void loadTranslator(void)
- #ifdef __APPLE__
- QString appdir = QCoreApplication::applicationDirPath() + "/../Resources/locale/";
- #else
-- QString appdir = QCoreApplication::applicationDirPath() + "/i18n/";
-+ QString appdir = "/usr/share/avidemux/i18n/";
- #endif
-
- loadTranslation(&qtTranslator, appdir + "qt_" + QLocale::system().name());
-@@ -164,4 +164,4 @@ const char* getNativeRendererDesc(void)
- }
-
- return "Qt";
--}
-\ No newline at end of file
-+}
-diff --git a/cmake/Ts.cmake b/cmake/Ts.cmake
-index 15eb89b..e40f078 100644
---- a/cmake/Ts.cmake
-+++ b/cmake/Ts.cmake
-@@ -64,7 +64,7 @@ MACRO(COMPILE_AVIDEMUX_TS_FILES ts_subdir _sources)
-
- SET(qm_files ${qm_files} ${_outXml} ${_out})
-
-- INSTALL(FILES ${_out} DESTINATION "${CMAKE_INSTALL_PREFIX}/${BIN_DIR}/i18n")
-+ INSTALL(FILES ${_out} DESTINATION "${CMAKE_INSTALL_PREFIX}/share/avidemux/i18n")
- ENDFOREACH(ts_input ${ts_files})
-
- SET(${_sources} ${${_sources}} ${qm_files})
-@@ -95,7 +95,7 @@ MACRO(COMPILE_QT_TS_FILES ts_subdir _sources)
-
- SET(qm_files ${qm_files} ${_out})
-
-- INSTALL(FILES ${_out} DESTINATION "${CMAKE_INSTALL_PREFIX}/${BIN_DIR}/i18n")
-+ INSTALL(FILES ${_out} DESTINATION "${CMAKE_INSTALL_PREFIX}/share/avidemux/i18n")
- ENDFOREACH(ts_input ${ts_files})
-
- SET(${_sources} ${${_sources}} ${qm_files})
diff --git a/multimedia/avidemux/avidemux.SlackBuild b/multimedia/avidemux/avidemux.SlackBuild
index 7b1f78efaa..6fe0b95c17 100644
--- a/multimedia/avidemux/avidemux.SlackBuild
+++ b/multimedia/avidemux/avidemux.SlackBuild
@@ -26,7 +26,7 @@
# project will use in the future. No additional license terms added
PRGNAM=avidemux
-VERSION=${VERSION:-2.5.2}
+VERSION=${VERSION:-2.5.4}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -71,9 +71,6 @@ cd $PRGNAM-$VERSION
chown -R root:root .
chmod -R a-s,u+w,go+r-w .
-#Patch that installs i18n in the correct place even if we compile with qt4 support
-cat $CWD/avidemux-2.5.1-i18n.patch | patch -p1 --verbose --backup --suffix=.orig
-
if [ "$ARCH" = "x86_64" ]; then
# Some paths are incorrectly hardcoded to "lib":
sed -i -e "s/Dir=\"lib\"/Dir=\"lib${LIBDIRSUFFIX}\"/" $(grep -lr 'Dir="lib"' .)
@@ -148,13 +145,23 @@ cat man/avidemux.1 | gzip -9c > $PKG/usr/man/man1/avidemux.1.gz
cd $TMP/$PRGNAM-$VERSION
mkdir -p $PKG/usr/share/{applications,pixmaps}
-cat avidemux2-gtk.desktop > $PKG/usr/share/applications/avidemux2-gtk.desktop
-cat avidemux2-gtk.desktop > $PKG/usr/share/applications/avidemux2-qt.desktop
-cat avidemux_icon.png > $PKG/usr/share/pixmaps/avidemux.png
-#patch avidemux2_qt.desktop to exec avidemux2_qt4 instead of avidemux2_gtk
-sed -i 's/avidemux2_gtk/avidemux2_qt4/' $PKG/usr/share/applications/avidemux2-qt.desktop
-sed -i 's/GTK+/Qt/g' $PKG/usr/share/applications/avidemux2-qt.desktop
-sed -i 's/GTK/Qt/' $PKG/usr/share/applications/avidemux2-qt.desktop
+mkdir -p $PKG/usr/share/icons/hicolor/{16x16,32x32,48x48,64x64}/apps
+# If the qt4 binary was built, we prefer to use that over the gtk version:
+if [ -x $PKG/usr/bin/avidemux2_qt4 ]; then
+ cat avidemux2.desktop | sed -e 's/_gtk/_qt4/' \
+ > $PKG/usr/share/applications/avidemux2.desktop
+else
+ install -m644 avidemux2.desktop $PKG/usr/share/applications/avidemux2.desktop
+fi
+install -m644 avidemux_icon.png $PKG/usr/share/pixmaps/avidemux.png
+install -m644 avidemux_icon.png \
+ ${PKG}/usr/share/icons/hicolor/64x64/apps/avidemux.png
+convert avidemux_icon.png -resize 16x16 \
+ ${PKG}/usr/share/icons/hicolor/16x16/apps/avidemux.png
+convert avidemux_icon.png -resize 32x32 \
+ ${PKG}/usr/share/icons/hicolor/32x32/apps/avidemux.png
+convert avidemux_icon.png -resize 48x48 \
+ ${PKG}/usr/share/icons/hicolor/48x48/apps/avidemux.png
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
cp -a AUTHORS COPYING README TODO \
@@ -168,6 +175,3 @@ cat $CWD/doinst.sh > $PKG/install/doinst.sh
cd $PKG
/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
-if [ "$1" = "--cleanup" ]; then
- rm -rf $PKG $TMP/$PRGNAM-$VERSION
- fi
diff --git a/multimedia/avidemux/avidemux.info b/multimedia/avidemux/avidemux.info
index 8622274c64..1491d4e987 100644
--- a/multimedia/avidemux/avidemux.info
+++ b/multimedia/avidemux/avidemux.info
@@ -1,9 +1,9 @@
PRGNAM="avidemux"
-VERSION="2.5.2"
+VERSION="2.5.4"
HOMEPAGE="http://avidemux.org"
-DOWNLOAD="http://downloads.sourceforge.net/avidemux/avidemux_2.5.2.tar.gz"
+DOWNLOAD="http://downloads.sourceforge.net/avidemux/avidemux_2.5.4.tar.gz"
DOWNLOAD_x86_64=""
-MD5SUM="9027e1324c06e833e6c3c22298503cc7"
+MD5SUM="b849460f6480df92bfd72d1a3dc288d4"
MD5SUM_x86_64=""
MAINTAINER="Niklas 'Nille' Åkerström"
EMAIL="Nille.kungen[AT]gmail.com"
diff --git a/multimedia/dirac/dirac-force-int-comparison.patch b/multimedia/dirac/dirac-force-int-comparison.patch
new file mode 100644
index 0000000000..d580451f9d
--- /dev/null
+++ b/multimedia/dirac/dirac-force-int-comparison.patch
@@ -0,0 +1,21 @@
+diff -ur dirac.old/libdirac_encoder/quant_chooser.cpp dirac-1.0.2/libdirac_encoder/quant_chooser.cpp
+--- dirac.old/libdirac_encoder/quant_chooser.cpp 2009-01-21 05:22:05.000000000 +0000
++++ dirac-1.0.2/libdirac_encoder/quant_chooser.cpp 2010-07-03 17:40:12.000000000 +0000
+@@ -340,7 +340,7 @@
+ {
+ for (int i=cblock.Xstart(); i<cblock.Xend(); ++i )
+ {
+- if ( (std::abs(m_coeff_data[j][i])<<2) >= u_threshold )
++ if ( (std::abs(int(m_coeff_data[j][i]))<<2) >= u_threshold )
+ can_skip = false;
+ }
+ }
+@@ -355,7 +355,7 @@
+ {
+ for (int i=node.Xp() ; i<node.Xp()+node.Xl(); ++i)
+ {
+- val = std::max( val , std::abs(m_coeff_data[j][i]) );
++ val = std::max( val , std::abs(int(m_coeff_data[j][i])) );
+ }// i
+ }// j
+
diff --git a/multimedia/dirac/dirac.SlackBuild b/multimedia/dirac/dirac.SlackBuild
index 3007b5b1a0..5a905d76b9 100644
--- a/multimedia/dirac/dirac.SlackBuild
+++ b/multimedia/dirac/dirac.SlackBuild
@@ -72,6 +72,10 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \;
+# http://www.mail-archive.com/debian-bugs-dist@lists.debian.org/msg800043.html
+# add a patch for gcc 4.5
+patch -p1 < $CWD/dirac-force-int-comparison.patch
+
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
diff --git a/multimedia/dvgrab/dvgrab.SlackBuild b/multimedia/dvgrab/dvgrab.SlackBuild
index 37b8c6370b..75073af847 100644
--- a/multimedia/dvgrab/dvgrab.SlackBuild
+++ b/multimedia/dvgrab/dvgrab.SlackBuild
@@ -88,10 +88,8 @@ make install DESTDIR=$PKG
find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
| cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-( cd $PKG/usr/man
- find . -type f -exec gzip -9 {} \;
- for i in $( find . -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-)
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
cp -a AUTHORS ChangeLog COPYING INSTALL NEWS README TODO \
diff --git a/multimedia/gpac/gpac.SlackBuild b/multimedia/gpac/gpac.SlackBuild
index e78141d982..3f0ab5bdcc 100644
--- a/multimedia/gpac/gpac.SlackBuild
+++ b/multimedia/gpac/gpac.SlackBuild
@@ -23,10 +23,12 @@
# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+# modified by ponce <matteo.bernardini@gmail.com>
PRGNAM=gpac
-VERSION=0.4.5
-BUILD=${BUILD:-3}
+VERSION=r2605
+BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
# Automatically determine the architecture we're building on:
@@ -65,13 +67,19 @@ else
wx_option="--enable-wx"
fi
+### xulrunner support
+if [ "${XULRUNNER_SUPPORT:-no}" = "no" ]; then
+ xulrunner_option=""
+else
+ xulrunner_option="--xulsdk-path=/usr/lib${LIBDIRSUFFIX}/xulrunner-devel/include"
+fi
+
rm -rf $PKG $TMP/$PRGNAM-$VERSION
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
tar xvf $CWD/$PRGNAM-$VERSION.tar.?z*
-mv $TMP/$PRGNAM $TMP/$PRGNAM-$VERSION
-cd $TMP/$PRGNAM-$VERSION
+cd $PRGNAM-$VERSION
chown -R root.root .
find . \
\( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -79,8 +87,6 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \;
-( cd src/media_tools; patch -p0 < $CWD/libpng-infopp-null.patch )
-
### fix configure script perms
chmod u+x configure
@@ -90,10 +96,13 @@ chmod u+x configure
--cpu=${ARCH} \
--extra-cflags="$SLKCFLAGS" \
--disable-ipv6 \
+ $xulrunner_option \
$wx_option
make -j1 # Parallel build seems to fail
make install DESTDIR=$PKG
+# install the sdk too
+make install-lib DESTDIR=$PKG
### remove $PKG/usr/share/gpac directory
### only contains gpac.mp4 file which
diff --git a/multimedia/gpac/gpac.info b/multimedia/gpac/gpac.info
index 79d4851c6d..dafd45cd30 100644
--- a/multimedia/gpac/gpac.info
+++ b/multimedia/gpac/gpac.info
@@ -1,10 +1,10 @@
PRGNAM="gpac"
-VERSION="0.4.5"
+VERSION="r605"
HOMEPAGE="http://gpac.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/gpac/gpac-0.4.5.tar.gz"
-MD5SUM="755e8c438a48ebdb13525dd491f5b0d1"
+DOWNLOAD="http://ponce.cc/slackware/sources/repo/gpac-r2605.tar.xz"
+MD5SUM="76c10d6d386f7d70fe35917484dd9885"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
MAINTAINER="Nishant Limbachia"
EMAIL="nishant@mnspace.net"
-APPROVED="dsomero"
+APPROVED=""
diff --git a/multimedia/gpac/libpng-infopp-null.patch b/multimedia/gpac/libpng-infopp-null.patch
deleted file mode 100644
index 58205fd769..0000000000
--- a/multimedia/gpac/libpng-infopp-null.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- img.c.orig 2010-05-27 22:20:32.758633643 -0500
-+++ img.c 2010-05-27 22:21:49.263633070 -0500
-@@ -551,7 +551,7 @@
- /* Allocate/initialize the image information data. REQUIRED */
- info_ptr = png_create_info_struct(png_ptr);
- if (info_ptr == NULL) {
-- png_destroy_write_struct(&png_ptr, png_infopp_NULL);
-+ png_destroy_write_struct(&png_ptr, NULL);
- return GF_IO_ERR;
- }
-
diff --git a/multimedia/gst-ffmpeg/gst-ffmpeg.SlackBuild b/multimedia/gst-ffmpeg/gst-ffmpeg.SlackBuild
index 280855242d..7dd99b28a2 100644
--- a/multimedia/gst-ffmpeg/gst-ffmpeg.SlackBuild
+++ b/multimedia/gst-ffmpeg/gst-ffmpeg.SlackBuild
@@ -22,7 +22,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=gst-ffmpeg
-VERSION=0.10.10
+VERSION=0.10.11
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
diff --git a/multimedia/gst-ffmpeg/gst-ffmpeg.info b/multimedia/gst-ffmpeg/gst-ffmpeg.info
index d32499357c..0921426f93 100644
--- a/multimedia/gst-ffmpeg/gst-ffmpeg.info
+++ b/multimedia/gst-ffmpeg/gst-ffmpeg.info
@@ -1,10 +1,10 @@
PRGNAM="gst-ffmpeg"
-VERSION="0.10.10"
+VERSION="0.10.11"
HOMEPAGE="http://gstreamer.freedesktop.org/"
-DOWNLOAD="http://gstreamer.freedesktop.org/src/gst-ffmpeg/gst-ffmpeg-0.10.10.tar.gz"
-MD5SUM="2222134a34f6b60071f3f03f8d0d01d2"
+DOWNLOAD="http://gstreamer.freedesktop.org/src/gst-ffmpeg/gst-ffmpeg-0.10.11.tar.gz"
+MD5SUM="41c6e16b5b171736241fb01f72d9bf9f"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
MAINTAINER="Juan Valencia Escalante"
EMAIL="jvalenciae@gmail.com"
-APPROVED="rworkman"
+APPROVED=""
diff --git a/multimedia/gst-plugins-bad/gst-plugins-bad.SlackBuild b/multimedia/gst-plugins-bad/gst-plugins-bad.SlackBuild
index e6db04b82e..22c2a0aa79 100644
--- a/multimedia/gst-plugins-bad/gst-plugins-bad.SlackBuild
+++ b/multimedia/gst-plugins-bad/gst-plugins-bad.SlackBuild
@@ -25,7 +25,7 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=gst-plugins-bad
-VERSION=${VERSION:-0.10.19}
+VERSION=${VERSION:-0.10.21}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
diff --git a/multimedia/gst-plugins-bad/gst-plugins-bad.info b/multimedia/gst-plugins-bad/gst-plugins-bad.info
index ea85617357..e416a316d4 100644
--- a/multimedia/gst-plugins-bad/gst-plugins-bad.info
+++ b/multimedia/gst-plugins-bad/gst-plugins-bad.info
@@ -1,10 +1,10 @@
PRGNAM="gst-plugins-bad"
-VERSION="0.10.19"
+VERSION="0.10.21"
HOMEPAGE="http://gstreamer.freedesktop.org/modules/gst-plugins-bad.html"
-DOWNLOAD="http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-0.10.19.tar.bz2"
-MD5SUM="368f72e2a1c7a6e8fe60394e4315259b"
+DOWNLOAD="http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-0.10.21.tar.bz2"
+MD5SUM="f501336ab1d18d2565f47c36ce653a82"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
MAINTAINER="Michiel van Wessem"
EMAIL="michiel@slackbuilds.org"
-APPROVED="Erik Hanson"
+APPROVED=""
diff --git a/multimedia/gst-plugins-ugly/gst-plugins-ugly.SlackBuild b/multimedia/gst-plugins-ugly/gst-plugins-ugly.SlackBuild
index 7ca71c44bb..30f6a4808e 100644
--- a/multimedia/gst-plugins-ugly/gst-plugins-ugly.SlackBuild
+++ b/multimedia/gst-plugins-ugly/gst-plugins-ugly.SlackBuild
@@ -25,7 +25,7 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=gst-plugins-ugly
-VERSION=${VERSION:-0.10.16}
+VERSION=${VERSION:-0.10.17}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
diff --git a/multimedia/gst-plugins-ugly/gst-plugins-ugly.info b/multimedia/gst-plugins-ugly/gst-plugins-ugly.info
index b442af5c15..703871443b 100644
--- a/multimedia/gst-plugins-ugly/gst-plugins-ugly.info
+++ b/multimedia/gst-plugins-ugly/gst-plugins-ugly.info
@@ -1,10 +1,10 @@
PRGNAM="gst-plugins-ugly"
-VERSION="0.10.16"
+VERSION="0.10.17"
HOMEPAGE="http://gstreamer.freedesktop.org/modules/gst-plugins-ugly.html"
-DOWNLOAD="http://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-0.10.16.tar.bz2"
-MD5SUM="989e1b0fab010f73f76912f70ec5f62a"
+DOWNLOAD="http://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-0.10.17.tar.bz2"
+MD5SUM="504ed6508c3a8f035a2002ed69d68506"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
MAINTAINER="Michiel van Wessem"
EMAIL="michiel@slackbuilds.org"
-APPROVED="dsomero"
+APPROVED=""
diff --git a/multimedia/mjpegtools/mjpegtools.SlackBuild b/multimedia/mjpegtools/mjpegtools.SlackBuild
index e2566c373a..d42ea23cd5 100644
--- a/multimedia/mjpegtools/mjpegtools.SlackBuild
+++ b/multimedia/mjpegtools/mjpegtools.SlackBuild
@@ -91,10 +91,8 @@ make install DESTDIR=$PKG
find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
| cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-( cd $PKG/usr/man
- find . -type f -exec gzip -9 {} \;
- for i in $(find . -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done
-)
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
rm -f $PKG/usr/info/dir
gzip -9 $PKG/usr/info/*
diff --git a/multimedia/mpgtx/mpgtx.SlackBuild b/multimedia/mpgtx/mpgtx.SlackBuild
index 4f5ffaaf72..a838ae5a4f 100644
--- a/multimedia/mpgtx/mpgtx.SlackBuild
+++ b/multimedia/mpgtx/mpgtx.SlackBuild
@@ -7,15 +7,13 @@
PRGNAM=mpgtx
VERSION=${VERSION:-1.3.1}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
-# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
i?86) ARCH=i486 ;;
arm*) ARCH=arm ;;
- # Unless $ARCH is already set, use uname -m for all other archs:
*) ARCH=$( uname -m ) ;;
esac
fi
@@ -25,6 +23,16 @@ TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
+if [ "$ARCH" = "i486" ]; then
+ SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+elif [ "$ARCH" = "i686" ]; then
+ SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+elif [ "$ARCH" = "x86_64" ]; then
+ SLKCFLAGS="-O2 -fPIC"
+else
+ SLKCFLAGS="-O2"
+fi
+
set -e
rm -rf $PKG
@@ -40,15 +48,11 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \;
-if [ "$ARCH" = "i486" ]; then
- sed -i "s|-O3|-O2 -march=i486 -mtune=i686|g" configure
-elif [ "$ARCH" = "i686" ]; then
- sed -i "s|-O3|-O2 -march=i686 -mtune=i686|g" configure
-elif [ "$ARCH" = "x86_64" ]; then
- sed -i "s|-O3|-O2 -fPIC|g" configure
-fi
+# Various fixes from Timothy Redaelli <drizzt@gentoo.org>
+patch -p0 < $CWD/patches/mpgtx-1.3.1-configure.patch
+patch -p1 < $CWD/patches/mpgtx-1.3.1-dont-ignore-cxx-flags.patch
-./configure --prefix=/usr
+CXXFLAGS=$SLKCFLAGS ./configure --prefix=/usr
make
cd man
@@ -69,10 +73,8 @@ mkdir -p $PKG/usr/man/de/man1
cp -a man/*.1 $PKG/usr/man/man1
cp -a man/de/*.1 $PKG/usr/man/de/man1
-( cd $PKG/usr/man
- find . -type f -exec gzip -9 {} \;
- for i in $( find . -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-)
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
cp -a AUTHORS COPYING README TODO $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/multimedia/mpgtx/patches/mpgtx-1.3.1-configure.patch b/multimedia/mpgtx/patches/mpgtx-1.3.1-configure.patch
new file mode 100644
index 0000000000..ec36e76ba6
--- /dev/null
+++ b/multimedia/mpgtx/patches/mpgtx-1.3.1-configure.patch
@@ -0,0 +1,69 @@
+--- configure.old 2006-12-07 19:51:08.000000000 +0100
++++ configure 2006-12-07 19:51:02.000000000 +0100
+@@ -9,7 +9,6 @@
+ prefix="/usr/local"
+ manprefix='$(PREFIX)'
+ #compiler flags
+-CC="g++"
+ common_cflags="-Wall"
+ devel_cflags="-g -Werror -fno-builtin"
+ optimization_cflags="-O3"
+@@ -36,7 +35,6 @@
+
+ if [ "${HOSTNAME}" = "powerpc-apple-darwin6.0" ]; then
+ #compiler flags
+-CC="c++"
+ common_cflags="-pedantic -Wall"
+ #devel_cflags="-g -Werror -fno-builtin"
+ devel_cflags="-g -fno-builtin"
+@@ -153,8 +151,15 @@
+ if test "$gcc_minor" = "0" -o "$gcc_minor" = "1"; then
+ optimization_cflags="-O2";
+ fi
++ if test "$gcc_minor" -ge 4; then
++ optimization_cflags="$optimization_cflags -fno-unit-at-a-time"
++ fi
++elif test "$gcc_major" -ge "4"; then
++ optimization_cflags="$optimization_cflags -fno-unit-at-a-time"
+ fi
+
++
++
+ # Now check if the system handles large file support
+ # unless user has specified not to do so
+ if test $LFS = "yes"; then
+@@ -165,7 +170,7 @@
+ return (int)(fseeko(stdin,0,SEEK_SET));
+ }
+ EOF
+- $CC __LFStest.cpp -o __LFStestPASSED -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE 1>__LFSout 2>__LFSerror
++ ${CXX:-c++} __LFStest.cpp -o __LFStestPASSED -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE 1>__LFSout 2>__LFSerror
+ if test -f __LFStestPASSED; then
+ echo "PASSED";
+ cflags="$cflags -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE";
+@@ -211,7 +211,6 @@
+ fi
+
+ if test $devel = "no" -a $debug = "no"; then
+-lflags="$lflags -s";
+ cflags="$cflags $optimization_cflags";
+ fi
+
+@@ -293,15 +298,15 @@
+ @echo ""
+
+ mpgtx : commandline.cxx mpegOut.o mpeg.o chunkTab.o id3command.o common.hh
+- $CC \$(CFLAGS) \$(OFLAGS) -o mpgtx commandline.cxx mpegOut.o mpeg.o chunkTab.o id3command.o \$(LFLAGS)
++ \$(CXX) \$(CFLAGS) \$(OFLAGS) \$(LDFLAGS) -o mpgtx commandline.cxx mpegOut.o mpeg.o chunkTab.o id3command.o \$(LFLAGS)
+ mpegOut.o : mpegOut.cxx mpegOut.hh mpeg.hh common.hh
+- $CC \$(CFLAGS) \$(OFLAGS) -c mpegOut.cxx
++ \$(CXX) \$(CFLAGS) \$(OFLAGS) -c mpegOut.cxx
+ mpeg.o : mpeg.cxx mpeg.hh mpegOut.hh common.hh
+- $CC \$(CFLAGS) \$(OFLAGS) -c mpeg.cxx
++ \$(CXX) \$(CFLAGS) \$(OFLAGS) -c mpeg.cxx
+ chunkTab.o : chunkTab.cxx chunkTab.hh common.hh
+- $CC \$(CFLAGS) \$(OFLAGS) -c chunkTab.cxx
++ \$(CXX) \$(CFLAGS) \$(OFLAGS) -c chunkTab.cxx
+ id3command.o : id3command.cxx id3command.hh common.hh
+- $CC \$(CFLAGS) \$(OFLAGS) -c id3command.cxx
++ \$(CXX) \$(CFLAGS) \$(OFLAGS) -c id3command.cxx
diff --git a/multimedia/mpgtx/patches/mpgtx-1.3.1-dont-ignore-cxx-flags.patch b/multimedia/mpgtx/patches/mpgtx-1.3.1-dont-ignore-cxx-flags.patch
new file mode 100644
index 0000000000..dc53dfd7e6
--- /dev/null
+++ b/multimedia/mpgtx/patches/mpgtx-1.3.1-dont-ignore-cxx-flags.patch
@@ -0,0 +1,12 @@
+diff -Naur mpgtx-1.3.1.orig/configure mpgtx-1.3.1/configure
+--- mpgtx-1.3.1.orig/configure 2010-11-28 11:58:58.000000000 +0100
++++ mpgtx-1.3.1/configure 2010-11-28 12:00:00.000000000 +0100
+@@ -11,7 +11,7 @@
+ #compiler flags
+ common_cflags="-Wall"
+ devel_cflags="-g -Werror -fno-builtin"
+-optimization_cflags="-O3"
++optimization_cflags="${CXXFLAGS}"
+ release_cflags=$optimization_cflags
+ OFLAGS="-ansi"
+ cflags=$common_cflags
generated by cgit v1.2.3 (git 2.32.0) at 2024-09-26 21:14:05 +0200