From abe9dfde4f0880c896197aeaf04770059a402b5f Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Sat, 23 Mar 2013 06:32:13 -0300 Subject: gst and gstreamer packages (except gstreamer0.10-bad-libre and gstreamer0.10-bad-libre): removing due that it is not user-visible for rebranding --- libre/gst-libav/PKGBUILD | 35 ---- libre/gst-plugins-base/PKGBUILD | 52 ------ libre/gst-plugins-good/PKGBUILD | 38 ----- libre/gst-plugins-ugly/PKGBUILD | 37 ----- libre/gstreamer/PKGBUILD | 35 ---- libre/gstreamer0.10-base/PKGBUILD | 53 ------ libre/gstreamer0.10-good/PKGBUILD | 55 ------- .../gstreamer0.10-good-plugins.install | 19 --- libre/gstreamer0.10-ugly/PKGBUILD | 54 ------ libre/gstreamer0.10-ugly/cdio-cd-text-api.patch | 183 --------------------- libre/gstreamer0.10-ugly/opencore-amr.patch | 35 ---- libre/gstreamer0.10/PKGBUILD | 41 ----- 12 files changed, 637 deletions(-) delete mode 100644 libre/gst-libav/PKGBUILD delete mode 100644 libre/gst-plugins-base/PKGBUILD delete mode 100644 libre/gst-plugins-good/PKGBUILD delete mode 100644 libre/gst-plugins-ugly/PKGBUILD delete mode 100644 libre/gstreamer/PKGBUILD delete mode 100644 libre/gstreamer0.10-base/PKGBUILD delete mode 100644 libre/gstreamer0.10-good/PKGBUILD delete mode 100644 libre/gstreamer0.10-good/gstreamer0.10-good-plugins.install delete mode 100644 libre/gstreamer0.10-ugly/PKGBUILD delete mode 100644 libre/gstreamer0.10-ugly/cdio-cd-text-api.patch delete mode 100644 libre/gstreamer0.10-ugly/opencore-amr.patch delete mode 100644 libre/gstreamer0.10/PKGBUILD diff --git a/libre/gst-libav/PKGBUILD b/libre/gst-libav/PKGBUILD deleted file mode 100644 index 3d92dcd9b..000000000 --- a/libre/gst-libav/PKGBUILD +++ /dev/null @@ -1,35 +0,0 @@ -# $Id$ -# Maintainer: Jan de Groot - -pkgname=gst-libav -pkgver=1.0.6 -pkgrel=1 -pkgdesc="Gstreamer libav Plugin, Parabola rebranded" -arch=('i686' 'x86_64' 'mips64el') -license=('GPL') -url="http://gstreamer.freedesktop.org/" -depends=('gst-plugins-base-libs' 'bzip2') -makedepends=('yasm') -options=(!libtool !emptydirs) -provides=("gst-ffmpeg=$pkgver-$pkgrel") -source=(${url}/src/$pkgname/$pkgname-$pkgver.tar.xz) -sha256sums=('8ab222a52bf7482e913f2c9a4f490cda8f8ed1acfbc429f27451b0558b08044d') - -build() { - cd $pkgname-$pkgver - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --disable-static --with-libav-extra-configure="--enable-runtime-cpudetect" \ - --with-package-name="GStreamer libav Plugin (Parabola GNU/Linux-libre)" \ - --with-package-origin="https://parabolagnulinux.org/" - make -} - -check() { - cd $pkgname-$pkgver - make check -} - -package() { - cd $pkgname-$pkgver - make DESTDIR="${pkgdir}" install -} diff --git a/libre/gst-plugins-base/PKGBUILD b/libre/gst-plugins-base/PKGBUILD deleted file mode 100644 index 55ac8e72c..000000000 --- a/libre/gst-plugins-base/PKGBUILD +++ /dev/null @@ -1,52 +0,0 @@ -# $Id$ -# Maintainer: Jan de Groot - -pkgbase=gst-plugins-base -pkgname=('gst-plugins-base-libs' 'gst-plugins-base') -pkgver=1.0.6 -pkgrel=1 -pkgdesc="GStreamer Multimedia Framework Base Plugins, Parabola rebranded" -arch=('i686' 'x86_64' 'mips64el') -license=('LGPL') -makedepends=('pkgconfig' 'gstreamer' 'orc' 'libxv' 'alsa-lib' 'cdparanoia' 'libvisual' 'libvorbis' 'libtheora' 'pango' 'gobject-introspection') -options=(!libtool !emptydirs) -url="http://gstreamer.freedesktop.org/" -source=(${url}/src/$pkgbase/$pkgbase-${pkgver}.tar.xz) -sha256sums=('85e5f99af690f720ccde5ea7e793269d35883a3ead80ca9985fa44e18bb1a4a5') - -build() { - cd $pkgbase-$pkgver - sed -i -e '/AC_PATH_XTRA/d' configure.ac - aclocal -I m4 -I common/m4 - autoconf - automake --add-missing - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --disable-static --enable-experimental \ - --with-package-name="GStreamer Base Plugins (Parabola GNU/Linux-libre)" \ - --with-package-origin="https://parabolagnulinux.org/" - make - sed -e 's/^SUBDIRS_EXT =.*/SUBDIRS_EXT =/' -i Makefile -} - -check() { - cd $pkgbase-$pkgver - # Testsuite fails on one test. Some refcount leak - make check -} - -package_gst-plugins-base-libs() { - pkgdesc="GStreamer Multimedia Framework Base Plugin libraries, Parabola rebranded" - depends=('gstreamer' 'orc' 'libxv') - - cd $pkgbase-$pkgver - make DESTDIR="${pkgdir}" install -} - -package_gst-plugins-base() { - depends=("gst-plugins-base-libs=$pkgver" 'alsa-lib' 'cdparanoia' 'libvisual' 'libvorbis' 'libtheora' 'pango') - - cd $pkgbase-$pkgver - make -C gst-libs DESTDIR="${pkgdir}" install - make -C ext DESTDIR="${pkgdir}" install - make -C gst-libs DESTDIR="${pkgdir}" uninstall -} diff --git a/libre/gst-plugins-good/PKGBUILD b/libre/gst-plugins-good/PKGBUILD deleted file mode 100644 index 9101bfdba..000000000 --- a/libre/gst-plugins-good/PKGBUILD +++ /dev/null @@ -1,38 +0,0 @@ -# $Id$ -# Maintainer: Jan de Groot - -pkgname=gst-plugins-good -pkgver=1.0.6 -pkgrel=1 -pkgdesc="GStreamer Multimedia Framework Good Plugins, Parabola rebranded" -arch=('i686' 'x86_64' 'mips64el') -license=('LGPL') -url="http://gstreamer.freedesktop.org/" -depends=('libpulse' 'jack' 'libsoup' 'gst-plugins-base-libs' 'wavpack' 'aalib' 'taglib' 'libdv' 'libshout' 'libvpx' 'gdk-pixbuf2' 'libcaca' 'libavc1394' 'libiec61883' 'libxdamage' 'v4l-utils' 'cairo') -makedepends=('gstreamer' 'speex' 'flac' 'libraw1394') -options=(!libtool !emptydirs) -source=(${url}/src/$pkgname/$pkgname-$pkgver.tar.xz) -sha256sums=('67f7690a9826d9a6ab28b9af2536a6f3e833ee412bd59dd603c48fb3c6823e0d') - -build() { - cd $pkgname-$pkgver - sed -i -e '/AC_PATH_XTRA/d' configure.ac - aclocal -I m4 -I common/m4 - autoconf - automake --add-missing - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --disable-static --enable-experimental \ - --with-package-name="GStreamer Good Plugins (Parabola GNU/Linux-libre)" \ - --with-package-origin="https://parabolagnulinux.org/" - make -} - -check() { - cd $pkgname-$pkgver - make check -} - -package() { - cd $pkgname-$pkgver - make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install -} diff --git a/libre/gst-plugins-ugly/PKGBUILD b/libre/gst-plugins-ugly/PKGBUILD deleted file mode 100644 index e0cc268ff..000000000 --- a/libre/gst-plugins-ugly/PKGBUILD +++ /dev/null @@ -1,37 +0,0 @@ -# $Id$ -# Maintainer: Jan de Groot - -pkgname=gst-plugins-ugly -pkgver=1.0.6 -pkgrel=1 -pkgdesc="GStreamer Multimedia Framework Ugly Plugins, Parabola rebranded" -arch=('i686' 'x86_64' 'mips64el') -license=('LGPL') -url="http://gstreamer.freedesktop.org/" -depends=('gst-plugins-base-libs' 'libdvdread' 'lame' 'libmpeg2' 'a52dec' 'libmad' 'libsidplay' 'libcdio' 'x264' 'opencore-amr') -options=(!libtool !emptydirs) -source=(${url}/src/$pkgname/$pkgname-$pkgver.tar.xz) -sha256sums=('8655ceec7533b5d30080a5051025e26ff8d06bea8d03a6b2af56c2f839d60586') - -build() { - cd $pkgname-$pkgver - sed -i '/AC_PATH_XTRA/d' configure.ac - aclocal -I m4 -I common/m4 - autoconf - automake --add-missing - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --disable-static --enable-experimental \ - --with-package-name="GStreamer Ugly Plugins (Parabola GNU/Linux-libre)" \ - --with-package-origin="https://parabolagnulinux.org/" - make -} - -check() { - cd $pkgname-$pkgver - make check -} - -package() { - cd $pkgname-$pkgver - make DESTDIR="${pkgdir}" install -} diff --git a/libre/gstreamer/PKGBUILD b/libre/gstreamer/PKGBUILD deleted file mode 100644 index 2eb34bb72..000000000 --- a/libre/gstreamer/PKGBUILD +++ /dev/null @@ -1,35 +0,0 @@ -# $Id$ -# Maintainer: Jan de Groot - -pkgname=gstreamer -pkgver=1.0.6 -pkgrel=1 -pkgdesc="GStreamer Multimedia Framework, Parabola rebranded" -arch=('i686' 'x86_64' 'mips64el') -license=('LGPL') -url="http://gstreamer.freedesktop.org/" -depends=('libxml2' 'glib2') -optdepends=('sh: feedback script') -makedepends=('intltool' 'pkgconfig' 'gtk-doc' 'gobject-introspection') -options=('!libtool') -source=(${url}/src/gstreamer/gstreamer-${pkgver}.tar.xz) -sha256sums=('50d4050cd6a23684b6bbf40a9b7c132edfb39fe9db2d81980adaa6e72f4d5826') - -build() { - cd "${srcdir}/gstreamer-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib \ - --with-package-name="GStreamer (Parabola GNU/Linux-libre)" \ - --with-package-origin="https://parabolagnulinux.org/" \ - --enable-gtk-doc --disable-static - make -} - -check() { - cd "${srcdir}/gstreamer-${pkgver}" - make check -} - -package() { - cd "${srcdir}/gstreamer-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/libre/gstreamer0.10-base/PKGBUILD b/libre/gstreamer0.10-base/PKGBUILD deleted file mode 100644 index 620c0bd87..000000000 --- a/libre/gstreamer0.10-base/PKGBUILD +++ /dev/null @@ -1,53 +0,0 @@ -# $Id$ -# Maintainer: Jan de Groot - -pkgbase=('gstreamer0.10-base') -pkgname=('gstreamer0.10-base' 'gstreamer0.10-base-plugins') -pkgver=0.10.36 -pkgrel=1.1 -arch=('i686' 'x86_64' 'mips64el') -license=('LGPL') -makedepends=('pkgconfig' 'gstreamer0.10>=0.10.35' 'orc' 'libxv' 'alsa-lib' 'cdparanoia' 'libvisual' 'libvorbis' 'libtheora' 'pango' 'gobject-introspection') -options=(!libtool !emptydirs) -url="http://gstreamer.freedesktop.org/" -source=(${url}/src/gst-plugins-base/gst-plugins-base-${pkgver}.tar.xz) -sha256sums=('1fe45c3894903001d4d008b0713dab089f53726dcb5842d5b40c2595a984e64a') - -build() { - cd "${srcdir}/gst-plugins-base-${pkgver}" - sed -i '/AC_PATH_XTRA/d' configure.ac - autoreconf - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --disable-static --enable-experimental --disable-gnome_vfs \ - --with-package-name="GStreamer Base Plugins (Parabola GNU/Linux-libre)" \ - --with-package-origin="https://parabolagnulinux.org/" - - make - sed -e 's/^SUBDIRS_EXT =.*/SUBDIRS_EXT =/' -i Makefile -} - -check() { - cd "${srcdir}/gst-plugins-base-${pkgver}" - make check -} - -package_gstreamer0.10-base() { - pkgdesc="GStreamer Multimedia Framework Base plugin libraries, Parabola rebranded" - depends=('gstreamer0.10>=0.10.35' 'orc' 'libxv') - - cd "${srcdir}/gst-plugins-base-${pkgver}" - make DESTDIR="${pkgdir}" install -} - -package_gstreamer0.10-base-plugins() { - pkgdesc="GStreamer Multimedia Framework Base Plugins (gst-plugins-base), Parabola rebranded" - depends=("gstreamer0.10-base=${pkgver}" 'alsa-lib' 'cdparanoia' 'libvisual' 'libvorbis' 'libtheora' 'pango') - replaces=('gstreamer0.10-alsa' 'gstreamer0.10-theora' 'gstreamer0.10-libvisual' 'gstreamer0.10-pango' 'gstreamer0.10-cdparanoia' 'gstreamer0.10-vorbis' 'gstreamer0.10-ogg') - conflicts=('gstreamer0.10-alsa' 'gstreamer0.10-theora' 'gstreamer0.10-libvisual' 'gstreamer0.10-pango' 'gstreamer0.10-cdparanoia' 'gstreamer0.10-vorbis' 'gstreamer0.10-ogg') - groups=('gstreamer0.10-plugins') - - cd "${srcdir}/gst-plugins-base-${pkgver}" - make -C gst-libs DESTDIR="${pkgdir}" install - make -C ext DESTDIR="${pkgdir}" install - make -C gst-libs DESTDIR="${pkgdir}" uninstall -} diff --git a/libre/gstreamer0.10-good/PKGBUILD b/libre/gstreamer0.10-good/PKGBUILD deleted file mode 100644 index 4cbaddd1e..000000000 --- a/libre/gstreamer0.10-good/PKGBUILD +++ /dev/null @@ -1,55 +0,0 @@ -# $Id$ -# Maintainer: Jan de Groot -# Maintainer (Parabola): André Silva - -pkgbase=gstreamer0.10-good -pkgname=('gstreamer0.10-good' 'gstreamer0.10-good-plugins') -pkgver=0.10.31 -pkgrel=1.2 -arch=('i686' 'x86_64' 'mips64el') -license=('LGPL') -makedepends=('intltool' 'pkgconfig' 'gstreamer0.10-base>=0.10.34' 'libavc1394' 'libiec61883' 'aalib' 'libshout' 'libdv' 'flac' 'gconf' 'wavpack' 'taglib' 'libsoup-gnome' 'v4l-utils' 'libcaca' 'bzip2' 'gdk-pixbuf2' 'libpulse' 'jack' 'udev') -url="http://gstreamer.freedesktop.org/" -options=(!libtool !emptydirs) -source=(${url}/src/gst-plugins-good/gst-plugins-good-${pkgver}.tar.xz) -sha256sums=('77a8436a7c0a15f876bad29616835046890df2bcaf72da02151bd91e3d292b64') - -build() { - cd "${srcdir}/gst-plugins-good-${pkgver}" - sed -i '/AC_PATH_XTRA/d' configure.ac - autoreconf - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --disable-static --enable-experimental \ - --disable-schemas-install \ - --disable-hal \ - --disable-esd \ - --with-package-name="GStreamer Good Plugins (Parabola GNU/Linux-libre)" \ - --with-package-origin="https://parabolagnulinux.org/" - - make - sed -e 's/gst sys ext/gst/' -i Makefile -} - -package_gstreamer0.10-good() { - depends=('gstreamer0.10-base>=0.10.34' 'bzip2') - pkgdesc="GStreamer Multimedia Framework Good plugin libraries, Parabola rebranded" - - cd "${srcdir}/gst-plugins-good-${pkgver}" - make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install - rm -rf "${pkgdir}/etc/gconf" -} - -package_gstreamer0.10-good-plugins() { - depends=("gstreamer0.10-good=${pkgver}" 'libavc1394' 'libiec61883' 'aalib' 'libshout' 'libdv' 'flac' 'gconf' 'wavpack' 'taglib' 'libsoup-gnome' 'v4l-utils' 'libcaca' 'libpng' 'libjpeg' 'jack' 'libpulse' 'udev') - pkgdesc="GStreamer Multimedia Framework Good Plugins (gst-plugins-good), Parabola rebranded" - groups=('gstreamer0.10-plugins') - replaces=('gstreamer0.10-aalib' 'gstreamer0.10-wavpack' 'gstreamer0.10-shout2' 'gstreamer0.10-taglib' 'gstreamer0.10-libcaca' 'gstreamer0.10-libpng' 'gstreamer0.10-jpeg' 'gstreamer0.10-cairo' 'gstreamer0.10-flac' 'gstreamer0.10-speex' 'gstreamer0.10-gdkpixbuf' 'gstreamer0.10-dv1394' 'gstreamer0.10-annodex' 'gstreamer0.10-gconf' 'gstreamer0.10-esd' 'gstreamer0.10-cdio' 'gstreamer0.10-dv' 'gstreamer0.10-soup' 'gstreamer0.10-pulse') - conflicts=('gstreamer0.10-aalib' 'gstreamer0.10-wavpack' 'gstreamer0.10-shout2' 'gstreamer0.10-taglib' 'gstreamer0.10-libcaca' 'gstreamer0.10-libpng' 'gstreamer0.10-jpeg' 'gstreamer0.10-cairo' 'gstreamer0.10-flac' 'gstreamer0.10-speex' 'gstreamer0.10-gdkpixbuf' 'gstreamer0.10-dv1394' 'gstreamer0.10-annodex' 'gstreamer0.10-gconf' 'gstreamer0.10-esd' 'gstreamer0.10-cdio' 'gstreamer0.10-dv' 'gstreamer0.10-bad-plugins<0.10.7' 'gstreamer0.10-soup' 'gstreamer0.10-pulse') - install=gstreamer0.10-good-plugins.install - - cd "${srcdir}/gst-plugins-good-${pkgver}" - make -C sys DESTDIR="${pkgdir}" install - make -C ext GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/usr/share/gconf/schemas" - install -m644 gconf/gstreamer-0.10.schemas "${pkgdir}/usr/share/gconf/schemas/gstreamer0.10-good-plugins.schemas" -} diff --git a/libre/gstreamer0.10-good/gstreamer0.10-good-plugins.install b/libre/gstreamer0.10-good/gstreamer0.10-good-plugins.install deleted file mode 100644 index e343beea5..000000000 --- a/libre/gstreamer0.10-good/gstreamer0.10-good-plugins.install +++ /dev/null @@ -1,19 +0,0 @@ -pkgname=gstreamer0.10-good-plugins - -post_install() { - usr/sbin/gconfpkg --install ${pkgname} -} - -pre_upgrade() { - if [ -f usr/share/gconf/schemas/${pkgname}.schemas ]; then - pre_remove - fi -} - -post_upgrade() { - post_install -} - -pre_remove() { - usr/sbin/gconfpkg --uninstall ${pkgname} -} diff --git a/libre/gstreamer0.10-ugly/PKGBUILD b/libre/gstreamer0.10-ugly/PKGBUILD deleted file mode 100644 index 6709ab2ea..000000000 --- a/libre/gstreamer0.10-ugly/PKGBUILD +++ /dev/null @@ -1,54 +0,0 @@ -# $Id$ -# Maintainer: Jan de Groot - -pkgbase=gstreamer0.10-ugly -pkgname=('gstreamer0.10-ugly' 'gstreamer0.10-ugly-plugins') -pkgver=0.10.19 -pkgrel=5.1 -arch=('i686' 'x86_64' 'mips64el') -license=('LGPL') -makedepends=('pkgconfig' 'gstreamer0.10-base>=0.10.34' 'libdvdread' 'lame' 'libmpeg2' 'a52dec' 'libmad' 'libsidplay' 'libcdio' 'x264' 'opencore-amr') -url="http://gstreamer.freedesktop.org/" -options=(!libtool) -source=(${url}/src/gst-plugins-ugly/gst-plugins-ugly-${pkgver}.tar.xz - opencore-amr.patch - cdio-cd-text-api.patch) -md5sums=('ba26045c8c8c91f0d48d327ccf53ac0c' - 'd8feb6c99bfaff8be6b2c48ea4e98e47' - '6c1c665f864387f3a77d32231fedeaab') - -build() { - cd "${srcdir}/gst-plugins-ugly-${pkgver}" - patch -Np0 -i "${srcdir}/opencore-amr.patch" - patch -Np1 -i "${srcdir}/cdio-cd-text-api.patch" - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --disable-static --enable-experimental \ - --with-package-name="GStreamer Ugly Plugins (Parabola GNU/Linux-libre)" \ - --with-package-origin="https://parabolagnulinux.org/" - make - sed -e 's/gst-libs gst ext/gst-libs gst/' -i Makefile -} - -check() { - cd "${srcdir}/gst-plugins-ugly-${pkgver}" - make check -} - -package_gstreamer0.10-ugly() { - pkgdesc="GStreamer Multimedia Framework Ugly plugin libraries, Parabola rebranded" - depends=('gstreamer0.10-base>=0.10.34') - - cd "${srcdir}/gst-plugins-ugly-${pkgver}" - make DESTDIR="${pkgdir}" install -} - -package_gstreamer0.10-ugly-plugins() { - pkgdesc="GStreamer Multimedia Framework Ugly Plugins (gst-plugins-ugly), Parabola rebranded" - depends=("gstreamer0.10-ugly=${pkgver}" 'libdvdread' 'lame' 'libmpeg2' 'a52dec' 'libmad' 'libsidplay' 'libcdio' 'x264' 'opencore-amr') - groups=('gstreamer0.10-plugins') - replaces=('gstreamer0.10-dvdread' 'gstreamer0.10-mpeg2dec' 'gstreamer0.10-mad' 'gstreamer0.10-lame' 'gstreamer0.10-sidplay' 'gstreamer0.10-a52dec') - conflicts=('gstreamer0.10-dvdread' 'gstreamer0.10-mpeg2dec' 'gstreamer0.10-mad' 'gstreamer0.10-lame' 'gstreamer0.10-sidplay' 'gstreamer0.10-a52dec') - - cd "${srcdir}/gst-plugins-ugly-${pkgver}" - make -C ext DESTDIR="${pkgdir}" install -} diff --git a/libre/gstreamer0.10-ugly/cdio-cd-text-api.patch b/libre/gstreamer0.10-ugly/cdio-cd-text-api.patch deleted file mode 100644 index cbd16b8e4..000000000 --- a/libre/gstreamer0.10-ugly/cdio-cd-text-api.patch +++ /dev/null @@ -1,183 +0,0 @@ -From 649bd92cd2600719862ad5189899212409dd0a67 Mon Sep 17 00:00:00 2001 -From: Leon Merten Lohse -Date: Thu, 03 May 2012 22:50:30 +0000 -Subject: cdio: compensate for libcdio's recent cd-text api changes - -https://bugzilla.gnome.org/show_bug.cgi?id=675112 - -Conflicts: - - ext/cdio/gstcdiocddasrc.c ---- -diff --git a/ext/cdio/gstcdio.c b/ext/cdio/gstcdio.c -index 2f58d18..483ebf5 100644 ---- a/ext/cdio/gstcdio.c -+++ b/ext/cdio/gstcdio.c -@@ -30,12 +30,16 @@ - GST_DEBUG_CATEGORY (gst_cdio_debug); - - void --gst_cdio_add_cdtext_field (GstObject * src, cdtext_t * cdtext, -+gst_cdio_add_cdtext_field (GstObject * src, cdtext_t * cdtext, track_t track, - cdtext_field_t field, const gchar * gst_tag, GstTagList ** p_tags) - { - const gchar *txt; - -+#if LIBCDIO_VERSION_NUM > 83 -+ txt = cdtext_get_const (cdtext, field, track); -+#else - txt = cdtext_get_const (field, cdtext); -+#endif - if (txt == NULL || *txt == '\0') { - GST_DEBUG_OBJECT (src, "empty CD-TEXT field %u (%s)", field, gst_tag); - return; -@@ -57,6 +61,12 @@ gst_cdio_add_cdtext_field (GstObject * src, cdtext_t * cdtext, - } - - GstTagList * -+#if LIBCDIO_VERSION_NUM > 83 -+gst_cdio_get_cdtext (GstObject * src, cdtext_t * t, track_t track) -+{ -+ GstTagList *tags = NULL; -+ -+#else - gst_cdio_get_cdtext (GstObject * src, CdIo * cdio, track_t track) - { - GstTagList *tags = NULL; -@@ -67,14 +77,22 @@ gst_cdio_get_cdtext (GstObject * src, CdIo * cdio, track_t track) - GST_DEBUG_OBJECT (src, "no CD-TEXT for track %u", track); - return NULL; - } -+#endif - -- gst_cdio_add_cdtext_field (src, t, CDTEXT_PERFORMER, GST_TAG_ARTIST, &tags); -- gst_cdio_add_cdtext_field (src, t, CDTEXT_TITLE, GST_TAG_TITLE, &tags); -+ gst_cdio_add_cdtext_field (src, t, track, CDTEXT_FIELD_PERFORMER, -+ GST_TAG_ARTIST, &tags); -+ gst_cdio_add_cdtext_field (src, t, track, CDTEXT_FIELD_TITLE, GST_TAG_TITLE, -+ &tags); - - return tags; - } - - void -+#if LIBCDIO_VERSION_NUM > 83 -+gst_cdio_add_cdtext_album_tags (GstObject * src, cdtext_t * t, -+ GstTagList * tags) -+{ -+#else - gst_cdio_add_cdtext_album_tags (GstObject * src, CdIo * cdio, GstTagList * tags) - { - cdtext_t *t; -@@ -84,11 +102,14 @@ gst_cdio_add_cdtext_album_tags (GstObject * src, CdIo * cdio, GstTagList * tags) - GST_DEBUG_OBJECT (src, "no CD-TEXT for album"); - return; - } -+#endif - -- /* FIXME: map CDTEXT_PERFORMER to GST_TAG_ALBUM_ARTIST once we have that */ -- gst_cdio_add_cdtext_field (src, t, CDTEXT_TITLE, GST_TAG_ALBUM, &tags); -- gst_cdio_add_cdtext_field (src, t, CDTEXT_GENRE, GST_TAG_GENRE, &tags); -- -+ gst_cdio_add_cdtext_field (src, t, 0, CDTEXT_FIELD_PERFORMER, -+ GST_TAG_ALBUM_ARTIST, &tags); -+ gst_cdio_add_cdtext_field (src, t, 0, CDTEXT_FIELD_TITLE, GST_TAG_ALBUM, -+ &tags); -+ gst_cdio_add_cdtext_field (src, t, 0, CDTEXT_FIELD_GENRE, GST_TAG_GENRE, -+ &tags); - GST_DEBUG ("CD-TEXT album tags: %" GST_PTR_FORMAT, tags); - } - -diff --git a/ext/cdio/gstcdio.h b/ext/cdio/gstcdio.h -index ef31ed0..c6da580 100644 ---- a/ext/cdio/gstcdio.h -+++ b/ext/cdio/gstcdio.h -@@ -24,22 +24,38 @@ - #include - #include - #include -+#include -+ -+#if LIBCDIO_VERSION_NUM <= 83 -+ #define CDTEXT_FIELD_PERFORMER CDTEXT_PERFORMER -+ #define CDTEXT_FIELD_GENRE CDTEXT_GENRE -+ #define CDTEXT_FIELD_TITLE CDTEXT_TITLE -+#endif - - GST_DEBUG_CATEGORY_EXTERN (gst_cdio_debug); - #define GST_CAT_DEFAULT gst_cdio_debug - - void gst_cdio_add_cdtext_field (GstObject * src, - cdtext_t * cdtext, -+ track_t track, - cdtext_field_t field, - const gchar * gst_tag, - GstTagList ** p_tags); - - GstTagList * gst_cdio_get_cdtext (GstObject * src, -+#if LIBCDIO_VERSION_NUM > 83 -+ cdtext_t * t, -+#else - CdIo * cdio, -+#endif - track_t track); - - void gst_cdio_add_cdtext_album_tags (GstObject * src, -+#if LIBCDIO_VERSION_NUM > 83 -+ cdtext_t * t, -+#else - CdIo * cdio, -+#endif - GstTagList * tags); - - #endif /* __GST_CDIO_H__ */ -diff --git a/ext/cdio/gstcdiocddasrc.c b/ext/cdio/gstcdiocddasrc.c -index 615a0c8..830839e 100644 ---- a/ext/cdio/gstcdiocddasrc.c -+++ b/ext/cdio/gstcdiocddasrc.c -@@ -206,6 +206,9 @@ gst_cdio_cdda_src_open (GstAudioCdSrc * audiocdsrc, const gchar * device) - GstCdioCddaSrc *src; - discmode_t discmode; - gint first_track, num_tracks, i; -+#if LIBCDIO_VERSION_NUM > 83 -+ cdtext_t *cdtext; -+#endif - - src = GST_CDIO_CDDA_SRC (audiocdsrc); - -@@ -232,8 +235,18 @@ gst_cdio_cdda_src_open (GstAudioCdSrc * audiocdsrc, const gchar * device) - if (src->read_speed != -1) - cdio_set_speed (src->cdio, src->read_speed); - -+#if LIBCDIO_VERSION_NUM > 83 -+ cdtext = cdio_get_cdtext (src->cdio); -+ -+ if (NULL == cdtext) -+ GST_DEBUG_OBJECT (src, "no CD-TEXT on disc"); -+ else -+ gst_cdio_add_cdtext_album_tags (GST_OBJECT_CAST (src), cdtext, -+ cddabasesrc->tags); -+#else - gst_cdio_add_cdtext_album_tags (GST_OBJECT_CAST (src), src->cdio, - cddabasesrc->tags); -+#endif - - GST_LOG_OBJECT (src, "%u tracks, first track: %d", num_tracks, first_track); - -@@ -250,8 +263,14 @@ gst_cdio_cdda_src_open (GstAudioCdSrc * audiocdsrc, const gchar * device) - * the right thing here (for cddb id calculations etc. as well) */ - track.start = cdio_get_track_lsn (src->cdio, i + first_track); - track.end = track.start + len_sectors - 1; /* -1? */ -+#if LIBCDIO_VERSION_NUM > 83 -+ if (NULL != cdtext) -+ track.tags = gst_cdio_get_cdtext (GST_OBJECT (src), cdtext, -+ i + first_track); -+#else - track.tags = gst_cdio_get_cdtext (GST_OBJECT (src), src->cdio, - i + first_track); -+#endif - - gst_audio_cd_src_add_track (GST_AUDIO_CD_SRC (src), &track); - } --- -cgit v0.9.0.2-2-gbebe diff --git a/libre/gstreamer0.10-ugly/opencore-amr.patch b/libre/gstreamer0.10-ugly/opencore-amr.patch deleted file mode 100644 index 0a350dc46..000000000 --- a/libre/gstreamer0.10-ugly/opencore-amr.patch +++ /dev/null @@ -1,35 +0,0 @@ ---- ext/amrnb/amrnbdec.h.orig 2012-03-12 16:49:14.417405139 +0000 -+++ ext/amrnb/amrnbdec.h 2012-03-12 16:49:35.393899419 +0000 -@@ -22,7 +22,7 @@ - - #include - #include --#include -+#include - - G_BEGIN_DECLS - ---- ext/amrnb/amrnbenc.h.orig 2012-03-12 16:49:23.833996062 +0000 -+++ ext/amrnb/amrnbenc.h 2012-03-12 16:49:46.597141876 +0000 -@@ -21,7 +21,7 @@ - #define __GST_AMRNBENC_H__ - - #include --#include -+#include - #include - - G_BEGIN_DECLS ---- ext/amrwbdec/amrwbdec.h.orig 2012-03-12 16:47:48.658100992 +0000 -+++ ext/amrwbdec/amrwbdec.h 2012-03-12 16:48:12.177910733 +0000 -@@ -22,8 +22,8 @@ - - #include - #include --#include --#include -+#include -+#include - - G_BEGIN_DECLS - diff --git a/libre/gstreamer0.10/PKGBUILD b/libre/gstreamer0.10/PKGBUILD deleted file mode 100644 index 416c1cbd9..000000000 --- a/libre/gstreamer0.10/PKGBUILD +++ /dev/null @@ -1,41 +0,0 @@ -# $Id$ -# Maintainer: Jan de Groot - -pkgname=gstreamer0.10 -pkgver=0.10.36 -pkgrel=1.1 -pkgdesc="GStreamer Multimedia Framework, Parabola rebranded" -arch=('i686' 'x86_64' 'mips64el') -license=('LGPL') -url="http://gstreamer.freedesktop.org/" -depends=('libxml2' 'glib2') -optdepends=('sh: feedback script') -makedepends=('intltool' 'pkgconfig' 'gtk-doc' 'gobject-introspection') -options=('!libtool') -source=(${url}/src/gstreamer/gstreamer-${pkgver}.tar.xz) -md5sums=('15389c73e091b1dda915279c388b9cb2') - -build() { - cd "${srcdir}/gstreamer-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib \ - --with-package-name="GStreamer (Parabola GNU/Linux-libre)" \ - --with-package-origin="https://parabolagnulinux.org/" \ - --enable-gtk-doc --disable-static - make -} - -check() { - cd "${srcdir}/gstreamer-${pkgver}" - make check -} - -package() { - cd "${srcdir}/gstreamer-${pkgver}" - make DESTDIR="${pkgdir}" install - - #Remove unversioned gst-* binaries to get rid of conflicts - cd "${pkgdir}/usr/bin" - for bins in `ls *-0.10`; do - rm -f ${bins/-0.10/} - done -} -- cgit v1.2.3