diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2012-01-13 14:21:34 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2012-01-13 14:21:34 -0300 |
| commit | 4a47b2a0e019de14d474e353a601ca6bf47e90e5 (patch) | |
| tree | 69e20048be17aa12e6342ebcafb0cf9cdbfee32d /community/xfmedia | |
| parent | 149750d28420a7b59fab5501ab9aaca095f6fa46 (diff) | |
| parent | b5f690637837ff269bf5d248ee2dc37ea5236ca8 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community-testing/packagekit/PKGBUILD
community/bird/PKGBUILD
community/camlp5/PKGBUILD
community/exim/PKGBUILD
community/ibus-table-extraphrase/PKGBUILD
community/mingw32-gcc-base/PKGBUILD
community/mingw32-gcc/PKGBUILD
community/torcs/PKGBUILD
core/db/PKGBUILD
core/iproute2/PKGBUILD
core/libsasl/PKGBUILD
core/openldap/PKGBUILD
core/pam/PKGBUILD
core/util-linux/PKGBUILD
extra/cyrus-sasl/PKGBUILD
extra/ffmpeg/PKGBUILD
extra/kdelibs/PKGBUILD
extra/libreoffice/PKGBUILD
extra/php/PKGBUILD
extra/postfix/PKGBUILD
extra/python-lxml/PKGBUILD
extra/rdesktop/PKGBUILD
extra/redland/PKGBUILD
extra/subversion/PKGBUILD
extra/tidyhtml/PKGBUILD
extra/transmission/PKGBUILD
extra/windowmaker/PKGBUILD
kde-unstable/calligra/PKGBUILD
multilib/lib32-libdrm/PKGBUILD
multilib/lib32-libdrm/no-pthread-stubs.patch
multilib/lib32-openssl/PKGBUILD
Diffstat (limited to 'community/xfmedia')
| -rw-r--r-- | community/xfmedia/PKGBUILD | 13 | ||||
| -rw-r--r-- | community/xfmedia/xfmedia-xine-1.2.0.patch | 34 |
2 files changed, 42 insertions, 5 deletions
diff --git a/community/xfmedia/PKGBUILD b/community/xfmedia/PKGBUILD index 92afa25ab..d20e33369 100644 --- a/community/xfmedia/PKGBUILD +++ b/community/xfmedia/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 58605 2011-11-16 15:28:21Z spupykin $ +# $Id: PKGBUILD 61923 2012-01-10 23:42:04Z ebelanger $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer : Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer : Tom Killian <tomk@runbox.com> @@ -6,7 +6,7 @@ pkgname=xfmedia pkgver=0.9.2 -pkgrel=9 +pkgrel=10 pkgdesc="xfce media player" arch=('i686' 'x86_64' 'mips64el') license=('GPL') @@ -17,18 +17,21 @@ install=xfmedia.install source=(http://spuriousinterrupt.org/files/$pkgname/$pkgname-$pkgver.tar.bz2 xfmedia-dbus-0.6-support.patch xfmedia-empty-prev-next-fix.patch - xfmedia-exo-0.6.patch) + xfmedia-exo-0.6.patch + xfmedia-xine-1.2.0.patch) md5sums=('6eb8bd1f67201f829e0f45e733c02bd5' '8f2aa12eea584de65d8ed28179e56b51' '650f8cb9e2ddd9a8a2a03748b8757110' - 'f5e17fcdf2056dcc8ca8aae8600c0132') + 'f5e17fcdf2056dcc8ca8aae8600c0132' + '934603c7d3a1a0a66edb847bcb930df1') build() { cd ${srcdir}/$pkgname-$pkgver patch -Np1 -i ../xfmedia-dbus-0.6-support.patch patch -Np1 -i ../xfmedia-empty-prev-next-fix.patch patch -Np1 -i ../xfmedia-exo-0.6.patch - ./configure --prefix=/usr + patch -Np1 -i ../xfmedia-xine-1.2.0.patch + LDFLAGS="$LDFLAGS -lXext -lm" ./configure --prefix=/usr make } diff --git a/community/xfmedia/xfmedia-xine-1.2.0.patch b/community/xfmedia/xfmedia-xine-1.2.0.patch new file mode 100644 index 000000000..2e04ac80a --- /dev/null +++ b/community/xfmedia/xfmedia-xine-1.2.0.patch @@ -0,0 +1,34 @@ +diff -wbBur xfmedia-0.9.2/src/xfmedia-xine.c xfmedia-0.9.2.my/src/xfmedia-xine.c +--- xfmedia-0.9.2/src/xfmedia-xine.c 2006-11-27 10:21:23.000000000 +0300 ++++ xfmedia-0.9.2.my/src/xfmedia-xine.c 2012-01-05 01:23:21.000000000 +0400 +@@ -1450,17 +1450,6 @@ + } + + gboolean +-xfmedia_xine_trick_mode(XfmediaXine * xfx, gint mode, gint value) +-{ +- +- g_return_val_if_fail(xfx != NULL, 0); +- g_return_val_if_fail(XFMEDIA_IS_XINE(xfx), 0); +- g_return_val_if_fail(xfx->priv->stream != NULL, 0); +- +- return xine_trick_mode(xfx->priv->stream, mode, value); +-} +- +-gboolean + xfmedia_xine_get_pos_length(XfmediaXine *xfx, gint *pos_stream, + gint *pos_time, gint *length_time) + { +diff -wbBur xfmedia-0.9.2/src/xfmedia-xine.h xfmedia-0.9.2.my/src/xfmedia-xine.h +--- xfmedia-0.9.2/src/xfmedia-xine.h 2006-11-27 10:21:23.000000000 +0300 ++++ xfmedia-0.9.2.my/src/xfmedia-xine.h 2012-01-05 01:20:47.000000000 +0400 +@@ -87,9 +87,6 @@ + gboolean xfmedia_xine_play (XfmediaXine *xfx, + gint pos, + gint start_time); +-gboolean xfmedia_xine_trick_mode (XfmediaXine *xfx, +- gint mode, +- gint value); + gint xfmedia_xine_get_stream_info (XfmediaXine *xfx, + gint info); + G_CONST_RETURN gchar *xfmedia_xine_get_meta_info (XfmediaXine *xfx, |