wok-next rev 19822
Up gstreamer0, gst0-plugins-base.
| author | Aleksej Bobylev <al.bobylev@gmail.com> |
|---|---|
| date | Sat Jul 29 17:26:14 2017 +0300 (2017-07-29) |
| parents | 795baf180500 |
| children | 898c3720fbdb |
| files | gst0-plugins-base/receipt gst0-plugins-base/stuff/patches/fix-comments.patch gst0-plugins-base/stuff/patches/gst-plugins-base-0.10.36-gcc_4_9_0_i686-1.patch gst0-plugins-base/stuff/patches/series gstreamer0/receipt gstreamer0/stuff/patches/gstreamer-bison3.patch gstreamer0/stuff/patches/series |
line diff
1.1 --- a/gst0-plugins-base/receipt Sat Jul 29 14:46:34 2017 +0300 1.2 +++ b/gst0-plugins-base/receipt Sat Jul 29 17:26:14 2017 +0300 1.3 @@ -1,29 +1,25 @@ 1.4 -# SliTaz package receipt. 1.5 +# SliTaz package receipt v2. 1.6 1.7 PACKAGE="gst0-plugins-base" 1.8 VERSION="0.10.36" 1.9 -SERIES="0.10" 1.10 CATEGORY="multimedia" 1.11 -SHORT_DESC="GStreamer Base Plugins" 1.12 +SHORT_DESC="GStreamer-0.10 Base Plugins" 1.13 MAINTAINER="jozee@slitaz.org" 1.14 LICENSE="GPL2" 1.15 -TARBALL="gst-plugins-base-$VERSION.tar.xz" 1.16 WEB_SITE="http://gstreamer.freedesktop.org/" 1.17 -WGET_URL="${WEB_SITE}src/gst-plugins-base/$TARBALL" 1.18 #HOST_ARCH="i486 arm" 1.19 1.20 -LOCALES="da de es fr id it pt_BR ru zh_CN" 1.21 -DEPENDS="gstreamer0 pango alsa-lib libogg libvorbis vorbis-tools udev \ 1.22 -xorg-libXv xorg-libXvMC cdparanoia-III orc" # libtheora libtheora-enc 1.23 -BUILD_DEPENDS="gstreamer0-dev pango-dev alsa-lib-dev libogg-dev \ 1.24 +TARBALL="gst-plugins-base-$VERSION.tar.xz" 1.25 +WGET_URL="https://gstreamer.freedesktop.org/src/gst-plugins-base/$TARBALL" 1.26 + 1.27 +BUILD_DEPENDS_arm="gstreamer0-dev pango-dev alsa-lib-dev libogg-dev \ 1.28 libtheora-dev libtheora-enc libvorbis-dev udev-dev xorg-libXv-dev \ 1.29 xorg-libXvMC-dev util-linux-uuid-dev" 1.30 - 1.31 -# Handle cross compilation 1.32 -case "$ARCH" in 1.33 - i?86) BUILD_DEPENDS="$BUILD_DEPENDS cdparanoia-III-dev orc-dev \ 1.34 -gobject-introspection-dev xorg-dev" ;; 1.35 -esac 1.36 +BUILD_DEPENDS="gstreamer0-dev pango-dev alsa-lib-dev libogg-dev libtheora-dev \ 1.37 +libtheora-enc libvorbis-dev udev-dev xorg-libXv-dev xorg-libXvMC-dev \ 1.38 +util-linux-uuid-dev cdparanoia-III-dev orc-dev gobject-introspection-dev \ 1.39 +xorg-dev gettext" 1.40 +SPLIT="gst0-plugins-base-dev" 1.41 1.42 # Rules to configure and make the package. 1.43 compile_rules() 1.44 @@ -33,29 +29,38 @@ 1.45 *) export CPPFLAGS="$CPPFLAGS -I/cross/$ARCH/sysroot/usr/include" ;; 1.46 esac 1.47 ./configure \ 1.48 - --prefix=/usr \ 1.49 --sysconfdir=/etc \ 1.50 --localstatedir=/var \ 1.51 --enable-experimental \ 1.52 --disable-static \ 1.53 --disable-debug \ 1.54 --disable-gnome_vfs \ 1.55 - --with-package-name="GStreamer Base Plugins ($SERIES)" \ 1.56 + --with-package-name="$SHORT_DESC" \ 1.57 --with-package-origin="http://www.slitaz.org/" \ 1.58 $CONFIGURE_ARGS && 1.59 make $MAKEFLAGS && make install 1.60 - 1.61 } 1.62 1.63 # Rules to gen a SliTaz package suitable for Tazpkg. 1.64 genpkg_rules() 1.65 { 1.66 - mkdir -p $fs/usr/lib/gstreamer-$SERIES $fs/usr/share/locale 1.67 - mv $install/usr/bin $fs/usr 1.68 - mv $install/usr/lib/*.so* $fs/usr/lib 1.69 - mv $install/usr/lib/gstreamer-$SERIES/*.so* $fs/usr/lib/gstreamer-$SERIES 1.70 - # mv $install/usr/lib/girepository-1.0 $fs/usr/lib 1.71 - # for locale in $LOCALES; do 1.72 - # mv $install/usr/share/locale/$locale $fs/usr/share/locale 1.73 - # done 1.74 + case $PACKAGE in 1.75 + *-base) 1.76 + copy @std 1.77 + DEPENDS="alsa-lib cairo cdparanoia-III glib gstreamer0 libogg \ 1.78 + libtheora-enc libvorbis libxml2 orc pango xorg-libICE xorg-libSM \ 1.79 + xorg-libX11 xorg-libXext xorg-libXv zlib" 1.80 + ;; 1.81 + *-dev) 1.82 + copy @dev 1.83 + DEPENDS="gst0-plugins-base alsa-lib-dev bzip2-dev cairo-dev \ 1.84 + cdparanoia-III fontconfig-dev freetype-dev glib-dev gstreamer0-dev \ 1.85 + harfbuzz-dev libffi-dev libogg-dev libpng16-dev libtheora-dev \ 1.86 + libvorbis-dev libxml2-dev orc-dev pango-dev pcre-dev \ 1.87 + util-linux-blkid-dev util-linux-mount-dev util-linux-uuid-dev \ 1.88 + xorg-libICE-dev xorg-libSM-dev xorg-libX11-dev xorg-libXau-dev \ 1.89 + xorg-libXdmcp-dev xorg-libXext-dev xorg-libXrender-dev \ 1.90 + xorg-libXv-dev xorg-libxcb-dev xorg-pixman-dev xz-dev zlib-dev" 1.91 + ;; 1.92 + esac 1.93 }
2.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 2.2 +++ b/gst0-plugins-base/stuff/patches/fix-comments.patch Sat Jul 29 17:26:14 2017 +0300 2.3 @@ -0,0 +1,34 @@ 2.4 +Fix errors like: 2.5 +/usr/bin/glib-mkenums: gstrtspdefs.h:234: Failed to parse ` /*< protected >*/ ' 2.6 + 2.7 +--- a/gst-libs/gst/rtsp/gstrtspdefs.h 2.8 ++++ b/gst-libs/gst/rtsp/gstrtspdefs.h 2.9 +@@ -231,7 +231,7 @@ 2.10 + * Enumeration of rtsp header fields. 2.11 + */ 2.12 + typedef enum { 2.13 +- /*< protected >*/ 2.14 ++ /* < protected > */ 2.15 + GST_RTSP_HDR_INVALID, 2.16 + 2.17 + /* 2.18 +@@ -345,7 +345,7 @@ 2.19 + * Enumeration of rtsp status codes. 2.20 + */ 2.21 + typedef enum { 2.22 +- /*< protected >*/ 2.23 ++ /* < protected > */ 2.24 + GST_RTSP_STS_INVALID = 0, 2.25 + GST_RTSP_STS_CONTINUE = 100, 2.26 + GST_RTSP_STS_OK = 200, 2.27 +--- a/gst-libs/gst/audio/multichannel.h 2.28 ++++ b/gst-libs/gst/audio/multichannel.h 2.29 +@@ -77,7 +77,7 @@ 2.30 + * are defined or all positions are undefined, but can't mix'n'match */ 2.31 + GST_AUDIO_CHANNEL_POSITION_NONE, 2.32 + 2.33 +- /*< private >*/ 2.34 ++ /* < private > */ 2.35 + /* don't use - counter */ 2.36 + GST_AUDIO_CHANNEL_POSITION_NUM 2.37 + } GstAudioChannelPosition;
3.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 3.2 +++ b/gst0-plugins-base/stuff/patches/gst-plugins-base-0.10.36-gcc_4_9_0_i686-1.patch Sat Jul 29 17:26:14 2017 +0300 3.3 @@ -0,0 +1,37 @@ 3.4 +Submitted By: Ken Moffat <ken at linuxfromscratch dot org> 3.5 +Date: 2014-05-26 3.6 +Initial Package Version: 0.10.36 3.7 +Upstream Status: Not offered, this is a workaround for gcc-4.9.0. 3.8 +Origin: Fernando, based on 3.9 + https://github.com/HandBrake/HandBrake/blob/master/contrib/lame/P00-darwin-xmmintrin.patch 3.10 +Description: Works around inlining failure on i686 with gcc-4.9.0. 3.11 +Rediffed to apply without fuzz and massive offset which caused 3.12 +configure.orig to get generated. 3.13 + 3.14 +Do Not Apply to x86_64. 3.15 + 3.16 +Note: there seems to still be a problem somewhere in the gst-0.10 audio 3.17 +on i686, I can get working video, but no audio. 3.18 + 3.19 +diff -Naur a/configure b/configure 3.20 +--- a/configure 2012-02-20 23:33:09.000000000 +0000 3.21 ++++ b/configure 2014-05-24 21:53:29.510695504 +0100 3.22 +@@ -21876,18 +21876,6 @@ 3.23 + done 3.24 + 3.25 + 3.26 +-for ac_header in xmmintrin.h emmintrin.h 3.27 +-do : 3.28 +- as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` 3.29 +-ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" 3.30 +-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : 3.31 +- cat >>confdefs.h <<_ACEOF 3.32 +-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 3.33 +-_ACEOF 3.34 +- 3.35 +-fi 3.36 +- 3.37 +-done 3.38 + 3.39 + 3.40 + # ------ AX CREATE STDINT H -------------------------------------
4.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 4.2 +++ b/gst0-plugins-base/stuff/patches/series Sat Jul 29 17:26:14 2017 +0300 4.3 @@ -0,0 +1,2 @@ 4.4 +gst-plugins-base-0.10.36-gcc_4_9_0_i686-1.patch 4.5 +fix-comments.patch
5.1 --- a/gstreamer0/receipt Sat Jul 29 14:46:34 2017 +0300 5.2 +++ b/gstreamer0/receipt Sat Jul 29 17:26:14 2017 +0300 5.3 @@ -3,7 +3,7 @@ 5.4 PACKAGE="gstreamer0" 5.5 VERSION="0.10.36" 5.6 CATEGORY="multimedia" 5.7 -SHORT_DESC="GStreamer Multimedia Framework" 5.8 +SHORT_DESC="GStreamer-0.10 Multimedia Framework" 5.9 MAINTAINER="jozee@slitaz.org" 5.10 LICENSE="LGPL2" 5.11 WEB_SITE="http://gstreamer.freedesktop.org/" 5.12 @@ -12,7 +12,6 @@ 5.13 TARBALL="gstreamer-$VERSION.tar.xz" 5.14 WGET_URL="https://gstreamer.freedesktop.org/src/gstreamer/$TARBALL" 5.15 5.16 -LOCALES="da de es fr id it pt_BR ru zh_CN" 5.17 BUILD_DEPENDS_arm="glib-dev libxml2-dev" 5.18 BUILD_DEPENDS="glib-dev libxml2-dev gobject-introspection-dev python-dev bison \ 5.19 flex m4 valgrind gettext" 5.20 @@ -27,9 +26,6 @@ 5.21 arm*) origin="http://arm.slitaz.org";; 5.22 esac 5.23 5.24 - # Change priv_gst_parse_yylex to fit new bison version 5.25 - sed -i s/'void \* yylval_param , //' gst/parse/grammar.y 5.26 - 5.27 ./configure \ 5.28 --sysconfdir=/etc \ 5.29 --localstatedir=/var \ 5.30 @@ -38,7 +34,7 @@ 5.31 --disable-static \ 5.32 --disable-examples \ 5.33 --disable-debug \ 5.34 - --with-package-name="GStreamer (0.10)" \ 5.35 + --with-package-name="GStreamer-0.10" \ 5.36 --with-package-origin="$origin" \ 5.37 $CONFIGURE_ARGS && 5.38 make $MAKEFLAGS && make install 5.39 @@ -50,11 +46,12 @@ 5.40 case $PACKAGE in 5.41 gstreamer0) 5.42 copy @std 5.43 - DEPENDS="glib libxml2" 5.44 + DEPENDS="glib libffi libxml2 pcre" 5.45 ;; 5.46 *-dev) 5.47 copy @dev 5.48 - DEPENDS="gstreamer0 glib-dev libxml2-dev" 5.49 + DEPENDS="gstreamer0 glib-dev libffi-dev libxml2-dev pcre-dev \ 5.50 + xz-dev zlib-dev" 5.51 ;; 5.52 esac 5.53 }
6.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 6.2 +++ b/gstreamer0/stuff/patches/gstreamer-bison3.patch Sat Jul 29 17:26:14 2017 +0300 6.3 @@ -0,0 +1,27 @@ 6.4 +From 90622bb35544655cf641e3ab65cf35a6d01869bc Mon Sep 17 00:00:00 2001 6.5 +From: Kerrick Staley <kerrick@kerrickstaley.com> 6.6 +Date: Tue, 20 Aug 2013 23:59:29 -0700 6.7 +Subject: [PATCH] Make grammar.y work with Bison 3 6.8 + 6.9 +YYLEX_PARAM is no longer supported in Bison 3. 6.10 + 6.11 +https://bugzilla.gnome.org/show_bug.cgi?id=706462 6.12 + 6.13 +--- a/gst/parse/grammar.y 6.14 ++++ b/gst/parse/grammar.y 6.15 +@@ -26,7 +26,6 @@ 6.16 + */ 6.17 + 6.18 + #define YYERROR_VERBOSE 1 6.19 +-#define YYLEX_PARAM scanner 6.20 + 6.21 + #define YYENABLE_NLS 0 6.22 + 6.23 +@@ -648,6 +647,7 @@ 6.24 + %right '.' 6.25 + %left '!' '=' 6.26 + 6.27 ++%lex-param { void *scanner } 6.28 + %parse-param { void *scanner } 6.29 + %parse-param { graph_t *graph } 6.30 + %pure-parser