summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRene Lengwinat <rugek@dirtyhack.net>2009-01-11 20:06:07 +0100
committerRene Lengwinat <rugek@dirtyhack.net>2009-01-11 20:06:07 +0100
commit04703730df05a75e9d931c4deb07c7f7af134752 (patch)
treec7ee907bcc7b641c5b041dcbd05dd44b585de83f
parentdc456f9ea9defd823a30db286d4b2414c875abcf (diff)
downloadcontrib-2.4.tar.gz
contrib-2.4.tar.xz
xmms2: added ffmpeg + fixed avcodec bug2.4
-rw-r--r--xmms2/.footprint4
-rw-r--r--xmms2/.md5sum1
-rw-r--r--xmms2/Pkgfile7
-rw-r--r--xmms2/avcodec.patch11
4 files changed, 21 insertions, 2 deletions
diff --git a/xmms2/.footprint b/xmms2/.footprint
index 700622573..f4aadae30 100644
--- a/xmms2/.footprint
+++ b/xmms2/.footprint
@@ -3,6 +3,7 @@ drwxr-xr-x root/root usr/bin/
-rwxr-xr-x root/root usr/bin/xmms2
-rwxr-xr-x root/root usr/bin/xmms2-et
-rwxr-xr-x root/root usr/bin/xmms2-launcher
+-rwxr-xr-x root/root usr/bin/xmms2-mlib-updater
-rwxr-xr-x root/root usr/bin/xmms2d
drwxr-xr-x root/root usr/include/
drwxr-xr-x root/root usr/include/xmms2/
@@ -106,11 +107,13 @@ drwxr-xr-x root/root usr/lib/xmms2/
-rw-r--r-- root/root usr/lib/xmms2/libxmms_alsa.so
-rw-r--r-- root/root usr/lib/xmms2/libxmms_asf.so
-rw-r--r-- root/root usr/lib/xmms2/libxmms_asx.so
+-rw-r--r-- root/root usr/lib/xmms2/libxmms_avcodec.so
-rw-r--r-- root/root usr/lib/xmms2/libxmms_cue.so
-rw-r--r-- root/root usr/lib/xmms2/libxmms_curl.so
-rw-r--r-- root/root usr/lib/xmms2/libxmms_daap.so
-rw-r--r-- root/root usr/lib/xmms2/libxmms_diskwrite.so
-rw-r--r-- root/root usr/lib/xmms2/libxmms_equalizer.so
+-rw-r--r-- root/root usr/lib/xmms2/libxmms_faad.so
-rw-r--r-- root/root usr/lib/xmms2/libxmms_file.so
-rw-r--r-- root/root usr/lib/xmms2/libxmms_flac.so
-rw-r--r-- root/root usr/lib/xmms2/libxmms_gme.so
@@ -156,3 +159,4 @@ drwxr-xr-x root/root usr/share/xmms2/
drwxr-xr-x root/root usr/share/xmms2/scripts/
drwxr-xr-x root/root usr/share/xmms2/scripts/startup.d/
-rwxr-xr-x root/root usr/share/xmms2/scripts/startup.d/xmms2-et-launcher.sh
+-rwxr-xr-x root/root usr/share/xmms2/scripts/startup.d/xmms2-mlib-updater.sh
diff --git a/xmms2/.md5sum b/xmms2/.md5sum
index a3a725d1b..8c59e5f4c 100644
--- a/xmms2/.md5sum
+++ b/xmms2/.md5sum
@@ -1 +1,2 @@
+7cb8831f1e3cc01444b249a79ebd91fb avcodec.patch
9033ef15be9069ef43aeb4b6360a4d36 xmms2-0.5DrLecter.tar.bz2
diff --git a/xmms2/Pkgfile b/xmms2/Pkgfile
index 63d651ab9..e1d116d26 100644
--- a/xmms2/Pkgfile
+++ b/xmms2/Pkgfile
@@ -1,17 +1,20 @@
# Description: Second generation of the XMMS music player
# URL: http://xmms2.sourceforge.net
# Maintainer: Rene Lengwinat, rugek at dirtyhack dot net
-# Depends on: libmad, sqlite3, python
+# Depends on: libmad, sqlite3, python, ffmpeg, faad2
# Nice to have: alsa-lib, curl, ecore, pyrex, ruby, samba
name=xmms2
version=0.5DrLecter
release=1
-source=(http://heanet.dl.sourceforge.net/sourceforge/xmms2/$name-$version.tar.bz2)
+source=(http://heanet.dl.sourceforge.net/sourceforge/xmms2/$name-$version.tar.bz2 \
+avcodec.patch)
build () {
cd $name-$version
+ patch -p1 < $SRC/avcodec.patch
+
./waf --prefix=/usr --with-mandir=/usr/man configure
./waf build
./waf --destdir=$PKG install
diff --git a/xmms2/avcodec.patch b/xmms2/avcodec.patch
new file mode 100644
index 000000000..40f59f059
--- /dev/null
+++ b/xmms2/avcodec.patch
@@ -0,0 +1,11 @@
+--- xmms2-0.5DrLecter.orig/src/plugins/avcodec/avcodec.c 2008-06-15 19:31:38.000000000 +0200
++++ xmms2-0.5DrLecter/src/plugins/avcodec/avcodec.c 2009-01-11 19:54:43.000000000 +0100
+@@ -24,7 +24,7 @@
+ #include <glib.h>
+
+ #undef ABS
+-#include "avcodec.h"
++#include <libavcodec/avcodec.h>
+
+ #define AVCODEC_BUFFER_SIZE 16384
+

Generated by cgit