summaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2011-12-22 08:35:27 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2011-12-22 10:32:41 +0000
commit07c790651791f365b19c4fcba91f5a261bda7c1d (patch)
treed85d6aea56ce26ad555d20e4d3ce53de43cee7d9 /main
parent93421c99e334b5b0b52948e01e786430e7b3b1d2 (diff)
main/mplayer: rebuild against x264-20111129
Diffstat (limited to 'main')
-rw-r--r--main/mplayer/APKBUILD6
-rw-r--r--main/mplayer/x11-libs.patch10
2 files changed, 14 insertions, 2 deletions
diff --git a/main/mplayer/APKBUILD b/main/mplayer/APKBUILD
index a6c2966722b..ce8b1a1fac2 100644
--- a/main/mplayer/APKBUILD
+++ b/main/mplayer/APKBUILD
@@ -2,7 +2,7 @@
pkgname=mplayer
pkgver=1.0_rc4
_ver=${pkgver%_*}${pkgver#*_}
-pkgrel=6
+pkgrel=7
pkgdesc="A movie player for linux"
url="http://www.mplayerhq.hu/"
arch="all"
@@ -17,6 +17,7 @@ makedepends="libxxf86dga-dev libxv-dev libmad-dev lame-dev libao-dev
source="http://www.mplayerhq.hu/MPlayer/releases/MPlayer-$_ver.tar.bz2
mplayer-gcc-4.6-audio-fix.patch
mplayer-libpng-1.5.patch
+ x11-libs.patch
"
_builddir="$srcdir"/MPlayer-$_ver
prepare() {
@@ -77,4 +78,5 @@ package() {
}
md5sums="1699c94de39da9c4c5d34e8f58e418f0 MPlayer-1.0rc4.tar.bz2
5f261813c5dfa70ba2378c2535428e5d mplayer-gcc-4.6-audio-fix.patch
-f3f3bae09f6cee684ced1dbc7d7ed23c mplayer-libpng-1.5.patch"
+f3f3bae09f6cee684ced1dbc7d7ed23c mplayer-libpng-1.5.patch
+01bcc935a6b429347e8e77e1a70bf2b2 x11-libs.patch"
diff --git a/main/mplayer/x11-libs.patch b/main/mplayer/x11-libs.patch
new file mode 100644
index 00000000000..4e6f8b5c174
--- /dev/null
+++ b/main/mplayer/x11-libs.patch
@@ -0,0 +1,10 @@
+--- ./configure.orig
++++ ./configure
+@@ -4394,6 +4394,7 @@
+ if test "$_x11" = yes ; then
+ def_x11='#define CONFIG_X11 1'
+ vomodules="x11 xover $vomodules"
++ libs_mplayer="$libs_mplayer -lX11 -lXext"
+ else
+ _x11=no
+ def_x11='#undef CONFIG_X11'