diff options
Diffstat (limited to 'source/l/gst-plugins-good')
| -rwxr-xr-x | source/l/gst-plugins-good/gst-plugins-good.SlackBuild | 12 | ||||
| -rw-r--r-- | source/l/gst-plugins-good/v4l.compile.fixes.diff | 57 |
2 files changed, 5 insertions, 64 deletions
diff --git a/source/l/gst-plugins-good/gst-plugins-good.SlackBuild b/source/l/gst-plugins-good/gst-plugins-good.SlackBuild index c935a42e0..280c9cbd0 100755 --- a/source/l/gst-plugins-good/gst-plugins-good.SlackBuild +++ b/source/l/gst-plugins-good/gst-plugins-good.SlackBuild @@ -26,12 +26,12 @@ PKGNAM=gst-plugins-good VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-5} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) export ARCH=i486 ;; + i?86) export ARCH=i586 ;; arm*) export ARCH=arm ;; # Unless $ARCH is already set, use uname -m for all other archs: *) export ARCH=$( uname -m ) ;; @@ -44,8 +44,8 @@ CWD=$(pwd) TMP=${TMP:-/tmp} PKG=$TMP/package-$PKGNAM -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" @@ -68,8 +68,6 @@ rm -rf $PKGNAM-$VERSION tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1 cd $PKGNAM-$VERSION -zcat $CWD/v4l.compile.fixes.diff.gz | patch -p1 --verbose || exit 1 - chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ @@ -85,8 +83,8 @@ CXXFLAGS="$SLKCFLAGS" \ --sysconfdir=/etc \ --localstatedir=/var \ --mandir=/usr/man \ - --disable-debug \ --disable-static \ + --disable-debug \ --build=$ARCH-slackware-linux || exit 1 make $NUMJOBS || make || exit 1 diff --git a/source/l/gst-plugins-good/v4l.compile.fixes.diff b/source/l/gst-plugins-good/v4l.compile.fixes.diff deleted file mode 100644 index e03fdac89..000000000 --- a/source/l/gst-plugins-good/v4l.compile.fixes.diff +++ /dev/null @@ -1,57 +0,0 @@ -From fa21c0bb253213c9dc48ce72faaf7090dc8a3554 Mon Sep 17 00:00:00 2001 -From: Colin Walters <walters@verbum.org> -Date: Thu, 2 May 2013 16:16:46 -0400 -Subject: [PATCH] sys/v4l2: Some blind compilation fixes - ---- - sys/v4l2/gstv4l2bufferpool.c | 1 - - sys/v4l2/v4l2_calls.c | 12 ++++-------- - 2 files changed, 4 insertions(+), 9 deletions(-) - -diff --git a/sys/v4l2/gstv4l2bufferpool.c b/sys/v4l2/gstv4l2bufferpool.c -index a0b4c84..3916815 100644 ---- a/sys/v4l2/gstv4l2bufferpool.c -+++ b/sys/v4l2/gstv4l2bufferpool.c -@@ -182,7 +182,6 @@ gst_v4l2_buffer_new (GstV4l2BufferPool * pool, guint index, GstCaps * caps) - GST_LOG_OBJECT (pool->v4l2elem, " MMAP offset: %u", - ret->vbuffer.m.offset); - GST_LOG_OBJECT (pool->v4l2elem, " length: %u", ret->vbuffer.length); -- GST_LOG_OBJECT (pool->v4l2elem, " input: %u", ret->vbuffer.input); - - ret->mmap_length = ret->vbuffer.length; - data = (guint8 *) v4l2_mmap (0, ret->vbuffer.length, -diff --git a/sys/v4l2/v4l2_calls.c b/sys/v4l2/v4l2_calls.c -index 309bfb6..ee3ff9f 100644 ---- a/sys/v4l2/v4l2_calls.c -+++ b/sys/v4l2/v4l2_calls.c -@@ -53,14 +53,6 @@ - - #include "gst/gst-i18n-plugin.h" - --/* Those are ioctl calls */ --#ifndef V4L2_CID_HCENTER --#define V4L2_CID_HCENTER V4L2_CID_HCENTER_DEPRECATED --#endif --#ifndef V4L2_CID_VCENTER --#define V4L2_CID_VCENTER V4L2_CID_VCENTER_DEPRECATED --#endif -- - GST_DEBUG_CATEGORY_EXTERN (v4l2_debug); - #define GST_CAT_DEFAULT v4l2_debug - -@@ -294,8 +286,12 @@ gst_v4l2_fill_lists (GstV4l2Object * v4l2object) - break; - case V4L2_CID_HFLIP: - case V4L2_CID_VFLIP: -+#ifdef V4L2_CID_HCENTER - case V4L2_CID_HCENTER: -+#endif -+#ifdef V4L2_CID_VCENTER - case V4L2_CID_VCENTER: -+#endif - #ifdef V4L2_CID_PAN_RESET - case V4L2_CID_PAN_RESET: - #endif --- -1.7.1 - |