summaryrefslogtreecommitdiffstats
path: root/abs/extra/community
diff options
context:
space:
mode:
Diffstat (limited to 'abs/extra/community')
-rw-r--r--abs/extra/community/agg/PKGBUILD34
-rw-r--r--abs/extra/community/agg/agg-2.4-depends.patch48
-rw-r--r--abs/extra/community/agg/agg-2.5-pkgconfig.patch10
-rw-r--r--abs/extra/community/gnash-common/PKGBUILD40
-rw-r--r--abs/extra/community/gnash-gtk/PKGBUILD40
-rw-r--r--abs/extra/community/gnash/PKGBUILD59
-rw-r--r--abs/extra/community/gstreamer0.10-base/PKGBUILD50
-rw-r--r--abs/extra/community/gstreamer0.10-ffmpeg/PKGBUILD28
-rw-r--r--abs/extra/community/gstreamer0.10/PKGBUILD32
-rw-r--r--abs/extra/community/gstreamer0.10/bgo555631.patch88
10 files changed, 229 insertions, 200 deletions
diff --git a/abs/extra/community/agg/PKGBUILD b/abs/extra/community/agg/PKGBUILD
new file mode 100644
index 0000000..b0d6d40
--- /dev/null
+++ b/abs/extra/community/agg/PKGBUILD
@@ -0,0 +1,34 @@
+# $Id: PKGBUILD 49798 2009-08-16 14:04:06Z jgc $
+# Maintainer:
+
+pkgname=agg
+pkgver=2.5
+pkgrel=3
+pkgdesc="A High Quality Rendering Engine for C++"
+arch=('i686' 'x86_64')
+url="http://www.antigrain.com/"
+license=('GPL')
+depends=('gcc-libs>=4.4.1' 'sdl>=1.2.13' 'freetype2>=2.3.9')
+makedepends=('automake')
+provides=('antigrain')
+replaces=('antigrain')
+options=('!libtool' '!makeflags')
+source=(http://www.antigrain.com/${pkgname}-${pkgver}.tar.gz
+ agg-2.4-depends.patch
+ agg-2.5-pkgconfig.patch)
+md5sums=('0229a488bc47be10a2fee6cf0b2febd6'
+ '22f8e48c137d25038181c86d5e40b110'
+ '43a19a7b1564c591e56c8d09a0fd8da5')
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ patch -Np1 -i "${srcdir}/agg-2.4-depends.patch" || return 1
+ patch -Np1 -i "${srcdir}/agg-2.5-pkgconfig.patch" || return 1
+ sh ./autogen.sh || return 1
+ ./configure --prefix=/usr --disable-static || return 1
+ make || return 1
+}
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make DESTDIR="${pkgdir}" install || return 1
+}
diff --git a/abs/extra/community/agg/agg-2.4-depends.patch b/abs/extra/community/agg/agg-2.4-depends.patch
new file mode 100644
index 0000000..9d4f6e3
--- /dev/null
+++ b/abs/extra/community/agg/agg-2.4-depends.patch
@@ -0,0 +1,48 @@
+--- agg-2.4.orig/font_freetype/Makefile.am 2005-10-18 11:45:40.000000000 +0100
++++ agg-2.4/font_freetype/Makefile.am 2006-07-10 15:11:55.000000000 +0100
+@@ -4,8 +4,9 @@
+ agginclude_HEADERS = agg_font_freetype.h
+ lib_LTLIBRARIES = libaggfontfreetype.la
+
+-libaggfontfreetype_la_LDFLAGS = -version-info @AGG_LIB_VERSION@ @FREETYPE_LIBS@
++libaggfontfreetype_la_LDFLAGS = -version-info @AGG_LIB_VERSION@
+ libaggfontfreetype_la_SOURCES = agg_font_freetype.cpp
+ libaggfontfreetype_la_CXXFLAGS = -I$(top_srcdir)/include @FREETYPE_CFLAGS@
++libaggfontfreetype_la_LIBADD = ../src/libagg.la @FREETYPE_LIBS@
+ endif
+
+--- agg-2.4.orig/src/platform/sdl/Makefile.am 2005-10-17 23:49:35.000000000 +0100
++++ agg-2.4/src/platform/sdl/Makefile.am 2006-07-10 15:11:55.000000000 +0100
+@@ -5,6 +5,6 @@
+ libaggplatformsdl_la_LDFLAGS = -version-info @AGG_LIB_VERSION@
+ libaggplatformsdl_la_SOURCES = agg_platform_support.cpp
+ libaggplatformsdl_la_CXXFLAGS = -I$(top_srcdir)/include @SDL_CFLAGS@
+-libaggplatformsdl_la_LIBADD = @SDL_LIBS@
++libaggplatformsdl_la_LIBADD = ../../libagg.la @SDL_LIBS@
+ endif
+
+--- agg-2.5.orig/configure.in 2006-10-09 05:06:36.000000000 +0100
++++ agg-2.5/configure.in 2007-01-07 14:07:39.000000000 +0000
+@@ -122,7 +122,8 @@
+ fi
+ AM_CONDITIONAL(ENABLE_X11,[test x$no_x = x -a xno != x$enable_platform -a x$win32_host != xyes])
+ AC_SUBST(x_includes)
+-AC_SUBST(x_libraries)
++test -n "$x_libraries" && X_LDFLAGS="-L$x_libraries"
++AC_SUBST(X_LDFLAGS)
+ dnl ###############################################
+
+ dnl Settung up library version
+--- agg-2.5.orig/src/platform/X11/Makefile.am 2006-12-11 00:59:45.000000000 +0000
++++ agg-2.5/src/platform/X11/Makefile.am 2007-01-07 14:07:39.000000000 +0000
+@@ -1,8 +1,8 @@
+ if ENABLE_X11
+ lib_LTLIBRARIES = libaggplatformX11.la
+
+-libaggplatformX11_la_LDFLAGS = -version-info @AGG_LIB_VERSION@ -L@x_libraries@
++libaggplatformX11_la_LDFLAGS = -version-info @AGG_LIB_VERSION@ @X_LDFLAGS@
+ libaggplatformX11_la_SOURCES = agg_platform_support.cpp
+ libaggplatformX11_la_CXXFLAGS = -I$(top_srcdir)/include -I@x_includes@
+-libaggplatformX11_la_LIBADD = -lX11
++libaggplatformX11_la_LIBADD = ../../libagg.la -lX11
+ endif
diff --git a/abs/extra/community/agg/agg-2.5-pkgconfig.patch b/abs/extra/community/agg/agg-2.5-pkgconfig.patch
new file mode 100644
index 0000000..a303bfb
--- /dev/null
+++ b/abs/extra/community/agg/agg-2.5-pkgconfig.patch
@@ -0,0 +1,10 @@
+--- agg-2.5/libagg.pc.in.orig 2007-01-07 13:58:28.000000000 +0000
++++ agg-2.5/libagg.pc.in 2007-01-07 14:02:40.000000000 +0000
+@@ -6,5 +6,6 @@
+ Name: libagg
+ Description: Anti Grain Geometry - A High Quality Rendering Engine for C++
+ Version: @VERSION@
+-Libs: -L${libdir} -Wl,-rpath,${exec_prefix}/lib -lagg
++Requires.private: freetype2
++Libs: -L${libdir} -lagg
+ Cflags: -I${includedir}
diff --git a/abs/extra/community/gnash-common/PKGBUILD b/abs/extra/community/gnash-common/PKGBUILD
deleted file mode 100644
index 107afb8..0000000
--- a/abs/extra/community/gnash-common/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# $Id: PKGBUILD 17544 2008-10-30 22:40:52Z pierre $
-
-pkgname=gnash-common
-pkgver=0.8.4
-pkgrel=1
-pkgdesc='A GNU Flash movie player'
-arch=('i686' 'x86_64')
-url='http://www.gnu.org/software/gnash/'
-license=('GPL3')
-depends=('curl' 'giflib' 'boost' 'libldap' 'gstreamer0.10-base' 'sdl' 'libgl'
- 'libjpeg' 'libpng' 'mesa')
-makedepends=('pkgconfig')
-source=("http://ftp.gnu.org/gnu/gnash/${pkgver}/gnash-${pkgver}.tar.bz2")
-options=('!libtool' '!emptydirs' '!docs')
-provides=('gnash')
-replaces=('gnash')
-md5sums=('b47a7ed4b7c66b8c2ebacc2286ef0d4b')
-
-build() {
- cd $srcdir/gnash-$pkgver
-
- ./configure --prefix=/usr \
- --sysconfdir=/etc \
- --disable-plugins \
- --disable-menus \
- --enable-gui=sdl \
- --enable-renderer=ogl \
- --enable-z \
- --enable-jpeg \
- --enable-libpng \
- --enable-gif \
- --enable-fontconfig \
- --enable-Xft \
- --enable-expat \
- --enable-gstreamer \
- --enable-media=gst || return 1
-
- make || return 1
- make DESTDIR=$pkgdir install || return 1
-}
diff --git a/abs/extra/community/gnash-gtk/PKGBUILD b/abs/extra/community/gnash-gtk/PKGBUILD
deleted file mode 100644
index 45ba804..0000000
--- a/abs/extra/community/gnash-gtk/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# $Id: PKGBUILD 17609 2008-10-31 06:16:21Z pierre $
-
-pkgname=gnash-gtk
-pkgver=0.8.4
-pkgrel=1
-pkgdesc='A GNU Flash movie player (gtk)'
-arch=('i686' 'x86_64')
-url='http://www.gnu.org/software/gnash/'
-license=("GPL3")
-depends=("gnash-common=$pkgver" 'gtk2' 'gtkglext')
-makedepends=('pkgconfig')
-source=("http://ftp.gnu.org/gnu/gnash/${pkgver}/gnash-${pkgver}.tar.bz2")
-options=('!libtool' '!emptydirs' '!docs')
-md5sums=('b47a7ed4b7c66b8c2ebacc2286ef0d4b')
-
-build() {
- cd $srcdir/gnash-$pkgver
-
- ./configure --prefix=/usr \
- --sysconfdir=/etc \
- --enable-gui=gtk \
- --with-plugins-install=system \
- --with-npapi-plugindir=/usr/lib/mozilla/plugins \
- --enable-renderer=ogl \
- --enable-z \
- --enable-jpeg \
- --enable-libpng \
- --enable-gif \
- --enable-fontconfig \
- --enable-Xft \
- --enable-expat \
- --enable-gstreamer \
- --enable-media=gst || return 1
-
- make || return 1
- make DESTDIR=$pkgdir install install-plugin || return 1
- rm -rf $pkgdir/usr/{lib/gnash,share}
- rm -f $pkgdir/usr/bin/{gnash,gprocessor,dumpshm,soldumper,flvdumper}
- rm -rf $pkgdir/etc
-}
diff --git a/abs/extra/community/gnash/PKGBUILD b/abs/extra/community/gnash/PKGBUILD
new file mode 100644
index 0000000..daed440
--- /dev/null
+++ b/abs/extra/community/gnash/PKGBUILD
@@ -0,0 +1,59 @@
+# $Id: PKGBUILD 82896 2010-06-18 18:30:20Z ibiru $
+# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
+
+pkgbase=gnash
+pkgname=(gnash-common gnash-gtk)
+pkgver=0.8.8
+pkgrel=1
+arch=('i686' 'x86_64')
+url="http://www.gnu.org/software/gnash/"
+license=(GPL3)
+makedepends=(curl giflib boost-libs libldap sdl agg libjpeg libpng libtool
+ speex fontconfig libva ffmpeg libxinerama
+ gstreamer0.10-base gstreamer0.10-ffmpeg
+ gtk2 libldap
+ pkgconfig boost)
+options=(!libtool !emptydirs)
+source=(http://ftp.gnu.org/gnu/gnash/${pkgver}/gnash-${pkgver}.tar.bz2)
+md5sums=('ce57f66e222f7eb1adf7f7b4a1274612')
+
+build() {
+ cd "$srcdir/gnash-$pkgver"
+
+ ./configure \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ --with-plugins-install=system \
+ --with-npapi-plugindir=/usr/lib/mozilla/plugins \
+ --enable-gui=sdl,gtk \
+ --enable-renderer=agg \
+ --enable-media=gst,ffmpeg \
+ --enable-hwaccel=vaapi
+
+ make
+}
+
+package_gnash-common() {
+ pkgdesc="A GNU Flash movie player"
+ depends=(curl giflib boost-libs libldap ffmpeg sdl agg libjpeg libpng
+ speex fontconfig libva libxinerama
+ gstreamer0.10-base gstreamer0.10-ffmpeg)
+ backup=(etc/gnashrc etc/gnashpluginrc)
+
+ cd "$srcdir/gnash-$pkgver"
+
+ make DESTDIR="$pkgdir" install
+
+ mv "$pkgdir/usr/bin/gtk-gnash" "$srcdir"
+}
+
+package_gnash-gtk() {
+ pkgdesc="A GNU Flash movie player"
+ depends=("gnash-common=$pkgver" gtk2 libldap)
+
+ cd "$srcdir/gnash-$pkgver"
+
+ make DESTDIR="$pkgdir" install-plugin
+
+ install -D "$srcdir/gtk-gnash" "$pkgdir/usr/bin/gtk-gnash"
+}
diff --git a/abs/extra/community/gstreamer0.10-base/PKGBUILD b/abs/extra/community/gstreamer0.10-base/PKGBUILD
index b1b065d..8b115a1 100644
--- a/abs/extra/community/gstreamer0.10-base/PKGBUILD
+++ b/abs/extra/community/gstreamer0.10-base/PKGBUILD
@@ -1,28 +1,46 @@
-# $Id: PKGBUILD 14433 2008-10-06 17:33:22Z jgc $
+# $Id: PKGBUILD 87769 2010-08-18 09:20:05Z jgc $
# Maintainer: Jan de Groot <jgc@archlinux.org>
-pkgname=gstreamer0.10-base
-pkgver=0.10.21
+pkgbase=('gstreamer0.10-base')
+pkgname=('gstreamer0.10-base' 'gstreamer0.10-base-plugins')
+pkgver=0.10.30
pkgrel=1
-pkgdesc="GStreamer Multimedia Framework Base plugin libraries"
-arch=(i686 x86_64)
-license=('GPL' 'LGPL')
-depends=('gstreamer0.10>=0.10.21' 'liboil>=0.3.15' 'libsm' 'libxv')
-makedepends=('pkgconfig')
-options=(!libtool)
+arch=('i686' 'x86_64')
+license=('LGPL')
+makedepends=('pkgconfig' 'gstreamer0.10>=0.10.30' 'orc>=0.4.6' 'libsm>=1.1.1' 'libxv>=1.0.5' 'alsa-lib>=1.0.23' 'cdparanoia>=10.2' 'libvisual>=0.4.0' 'libvorbis>=1.3.1' 'libtheora>=1.1.1' 'pango>=1.28.1' 'udev>=151' 'gobject-introspection')
+options=(!libtool !emptydirs)
url="http://gstreamer.freedesktop.org/"
-_relname=gst-plugins-base
-source=(${url}/src/${_relname}/${_relname}-${pkgver}.tar.bz2)
-md5sums=('0e0cd485311502ad1c0c028148e3186a')
+source=(${url}/src/gst-plugins-base/gst-plugins-base-${pkgver}.tar.bz2)
+sha256sums=('63938641380be9935c804ae8d55acdcfd93920ed2deb72dcf70f027a78b085d7')
build() {
- cd ${startdir}/src/${_relname}-${pkgver}
+ cd "${srcdir}/gst-plugins-base-${pkgver}"
./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
- --disable-static --enable-experimental --disable-external \
- --disable-docs-build --disable-plugin-docs \
+ --disable-static --enable-experimental --disable-gnome_vfs \
--with-package-name="GStreamer Base Plugins (Archlinux)" \
--with-package-origin="http://www.archlinux.org/" || return 1
make || return 1
- make DESTDIR=${startdir}/pkg install || return 1
+ sed -e 's/^SUBDIRS_EXT =.*/SUBDIRS_EXT =/' -i Makefile || return 1
+}
+
+package_gstreamer0.10-base() {
+ pkgdesc="GStreamer Multimedia Framework Base plugin libraries"
+ depends=('gstreamer0.10>=0.10.30' 'orc>=0.4.6' 'libsm>=1.1.1' 'libxv>=1.0.5' 'udev>=151')
+
+ cd "${srcdir}/gst-plugins-base-${pkgver}"
+ make DESTDIR="${pkgdir}" install || return 1
+}
+
+package_gstreamer0.10-base-plugins() {
+ pkgdesc="GStreamer Multimedia Framework Base Plugins (gst-plugins-base)"
+ depends=("gstreamer0.10-base=${pkgver}" 'alsa-lib>=1.0.23' 'cdparanoia>=10.2' 'libvisual>=0.4.0' 'libvorbis>=1.3.1' 'libtheora>=1.1.1' 'pango>=1.28.1')
+ 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 || return 1
+ make -C ext DESTDIR="${pkgdir}" install || return 1
+ make -C gst-libs DESTDIR="${pkgdir}" uninstall || return 1
}
diff --git a/abs/extra/community/gstreamer0.10-ffmpeg/PKGBUILD b/abs/extra/community/gstreamer0.10-ffmpeg/PKGBUILD
new file mode 100644
index 0000000..7922430
--- /dev/null
+++ b/abs/extra/community/gstreamer0.10-ffmpeg/PKGBUILD
@@ -0,0 +1,28 @@
+# $Id: PKGBUILD 72240 2010-03-13 20:27:01Z ibiru $
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+
+pkgname=gstreamer0.10-ffmpeg
+pkgver=0.10.10
+pkgrel=1
+pkgdesc="Gstreamer FFMpeg Plugin"
+arch=('i686' 'x86_64')
+license=('GPL')
+depends=('gstreamer0.10-base>=0.10.30' 'bzip2')
+makedepends=('pkgconfig')
+url="http://www.gstreamer.net"
+groups=('gstreamer0.10-plugins')
+source=(http://gstreamer.freedesktop.org/src/gst-ffmpeg/gst-ffmpeg-${pkgver}.tar.bz2)
+sha256sums=('697114483444a0a469028857a1d58145c99e6f5d2cd7edd8cb04cdc3fc72ad94')
+
+build() {
+ cd "${srcdir}/gst-ffmpeg-${pkgver}"
+ unset CFLAGS
+ unset CXXFLAGS
+ ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var || return 1
+ make || return 1
+}
+package() {
+ cd "${srcdir}/gst-ffmpeg-${pkgver}"
+ make DESTDIR="${pkgdir}" install || return 1
+ rm -f ${pkgdir}/usr/lib/gstreamer-0.10/*.{l,}a
+}
diff --git a/abs/extra/community/gstreamer0.10/PKGBUILD b/abs/extra/community/gstreamer0.10/PKGBUILD
index 52934e2..0a52614 100644
--- a/abs/extra/community/gstreamer0.10/PKGBUILD
+++ b/abs/extra/community/gstreamer0.10/PKGBUILD
@@ -1,29 +1,29 @@
-# $Id: PKGBUILD 18833 2008-11-09 14:51:01Z jgc $
+# $Id: PKGBUILD 87764 2010-08-18 09:05:27Z jgc $
# Maintainer: Jan de Groot <jgc@archlinux.org>
pkgname=gstreamer0.10
-pkgver=0.10.21
-pkgrel=2
+pkgver=0.10.30
+pkgrel=1
pkgdesc="GStreamer Multimedia Framework"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
license=('LGPL')
url="http://gstreamer.freedesktop.org/"
-depends=('libxml2>=2.6.32' 'glib2>=2.18.1')
-makedepends=('perlxml' 'pkgconfig' 'gtk-doc')
+depends=('libxml2>=2.7.7' 'glib2>=2.24.1')
+makedepends=('intltool' 'pkgconfig' 'gtk-doc' 'gobject-introspection')
options=('!libtool')
-source=(${url}/src/gstreamer/gstreamer-${pkgver}.tar.bz2
- bgo555631.patch)
-md5sums=('7bad90af3fd81a1535363cf85359125c'
- '71eb301845184638e6556dacd1ca7d55')
+source=(${url}/src/gstreamer/gstreamer-${pkgver}.tar.bz2)
+sha256sums=('e8ef301be423797ff36a0bb3615930b112b4175634051d19fd655e0ed974532a')
build() {
cd "${srcdir}/gstreamer-${pkgver}"
- patch -Np0 -i "${srcdir}/bgo555631.patch" || return 1
- ./configure --prefix=/usr \
- --sysconfdir=/etc --localstatedir=/var \
- --disable-docs-build || return 1
- make || return 1
- make DESTDIR="${pkgdir}" install || return 1
+ ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib \
+ --with-package-name="GStreamer (Archlinux)" \
+ --with-package-origin="http://www.archlinux.org/"
+ make
+}
+package() {
+ cd "${srcdir}/gstreamer-${pkgver}"
+ make DESTDIR="${pkgdir}" install
cd "${pkgdir}/usr/bin"
#Remove unversioned gst-* binaries to get rid of conflicts
diff --git a/abs/extra/community/gstreamer0.10/bgo555631.patch b/abs/extra/community/gstreamer0.10/bgo555631.patch
deleted file mode 100644
index b9a18f4..0000000
--- a/abs/extra/community/gstreamer0.10/bgo555631.patch
+++ /dev/null
@@ -1,88 +0,0 @@
---- libs/gst/base/gstbasetransform.c 2008/10/20 13:29:06 1.126
-+++ libs/gst/base/gstbasetransform.c 2008/10/21 16:30:41 1.127
-@@ -251,7 +251,7 @@
- /* upstream caps and size suggestions */
- GstCaps *sink_suggest;
- guint size_suggest;
-- gint suggest_pending;
-+ gboolean suggest_pending;
-
- gboolean reconfigure;
- };
-@@ -1224,7 +1224,7 @@
- gst_caps_unref (priv->sink_suggest);
- priv->sink_suggest = gst_caps_ref (othercaps);
- priv->size_suggest = size_suggest;
-- g_atomic_int_set (&trans->priv->suggest_pending, 1);
-+ trans->priv->suggest_pending = TRUE;
- GST_OBJECT_UNLOCK (trans->sinkpad);
- }
- gst_caps_unref (othercaps);
-@@ -1366,7 +1366,7 @@
- GstBaseTransform *trans;
- GstBaseTransformPrivate *priv;
- GstFlowReturn res;
-- gboolean proxy, suggest;
-+ gboolean proxy, suggest, same_caps;
- GstCaps *sink_suggest;
- guint size_suggest;
-
-@@ -1384,8 +1384,12 @@
-
- /* we remember our previous alloc request to quickly see if we can proxy or
- * not. We skip this check if we have a pending suggestion. */
-- if (g_atomic_int_get (&priv->suggest_pending) == 0 && caps &&
-- gst_caps_is_equal (priv->sink_alloc, caps)) {
-+ GST_OBJECT_LOCK (pad);
-+ same_caps = !priv->suggest_pending && caps &&
-+ gst_caps_is_equal (priv->sink_alloc, caps);
-+ GST_OBJECT_UNLOCK (pad);
-+
-+ if (same_caps) {
- /* we have seen this before, see below if we need to proxy */
- GST_DEBUG_OBJECT (trans, "have old caps");
- sink_suggest = caps;
-@@ -1414,7 +1418,7 @@
- size_suggest = size;
- suggest = FALSE;
- }
-- g_atomic_int_set (&priv->suggest_pending, 0);
-+ priv->suggest_pending = FALSE;
- GST_OBJECT_UNLOCK (pad);
-
- /* check if we actually handle this format on the sinkpad */
-@@ -1462,7 +1466,10 @@
- }
- }
- /* remember the new caps */
-+ GST_OBJECT_LOCK (pad);
- gst_caps_replace (&priv->sink_alloc, sink_suggest);
-+ GST_OBJECT_UNLOCK (pad);
-+
- proxy = priv->proxy_alloc;
- GST_DEBUG_OBJECT (trans, "doing default alloc, proxy %d", proxy);
-
-@@ -1487,11 +1494,13 @@
- if (!gst_caps_is_equal (newcaps, caps)) {
- GST_DEBUG_OBJECT (trans, "caps are new");
- /* we have new caps, see if we can proxy downstream */
-- if (gst_pad_peer_accept_caps (trans->sinkpad, newcaps)) {
-+ if (gst_pad_peer_accept_caps (pad, newcaps)) {
- /* peer accepts the caps, return a buffer in this format */
- GST_DEBUG_OBJECT (trans, "peer accepted new caps");
- /* remember the format */
-+ GST_OBJECT_LOCK (pad);
- gst_caps_replace (&priv->sink_alloc, newcaps);
-+ GST_OBJECT_UNLOCK (pad);
- } else {
- GST_DEBUG_OBJECT (trans, "peer did not accept new caps");
- /* peer does not accept the caps, free the buffer we received and
-@@ -2306,7 +2315,7 @@
- caps = gst_caps_copy (caps);
- trans->priv->sink_suggest = caps;
- trans->priv->size_suggest = size;
-- g_atomic_int_set (&trans->priv->suggest_pending, 1);
-+ trans->priv->suggest_pending = TRUE;
- GST_DEBUG_OBJECT (trans, "new suggest %" GST_PTR_FORMAT, caps);
- GST_OBJECT_UNLOCK (trans->sinkpad);
- }
generated by cgit v0.12 at 2024-12-19 02:02:27 (GMT)