summaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2013-08-08 08:31:16 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2013-08-08 08:31:16 +0000
commitfc6b3dba6b46c01ff052e9a28e94de8f182b440c (patch)
tree64262edfa80834f5aeb5173368962cac4c7ebb83 /main
parent876620009557758276694a8c4f74249971edfc4e (diff)
downloadaports-fc6b3dba6b46c01ff052e9a28e94de8f182b440c.tar.bz2
aports-fc6b3dba6b46c01ff052e9a28e94de8f182b440c.tar.xz
main/mplayer: enable vdpau, vpx and cdio
Diffstat (limited to 'main')
-rw-r--r--main/mplayer/APKBUILD14
-rw-r--r--main/mplayer/cdio-includes.patch43
2 files changed, 52 insertions, 5 deletions
diff --git a/main/mplayer/APKBUILD b/main/mplayer/APKBUILD
index 45aea5661..3cca82c88 100644
--- a/main/mplayer/APKBUILD
+++ b/main/mplayer/APKBUILD
@@ -2,7 +2,7 @@
pkgname=mplayer
pkgver=1.1.1
_ver=${pkgver/_/}
-pkgrel=1
+pkgrel=2
pkgdesc="A movie player for linux"
url="http://www.mplayerhq.hu/"
arch="all"
@@ -12,9 +12,10 @@ subpackages="$pkgname-doc"
makedepends="libxxf86dga-dev libxv-dev libmad-dev lame-dev libao-dev
libtheora-dev xvidcore-dev zlib-dev sdl-dev freetype-dev
x264-dev faac-dev ttf-dejavu libxvmc-dev alsa-lib-dev live-media-dev
- mesa-dev yasm libpng-dev"
+ mesa-dev yasm libpng-dev libvdpau-dev libvpx-dev libcdio-paranoia-dev"
source="ftp://ftp1.mplayerhq.hu/MPlayer/releases/MPlayer-$pkgver.tar.xz
+ cdio-includes.patch
x11-libs.patch
"
_builddir="$srcdir"/MPlayer-$_ver
@@ -32,8 +33,6 @@ build() {
export GCC_SPECS=hardenednopie.specs
./configure \
- --build=$CBUILD \
- --host=$CHOST \
--prefix=/usr \
--disable-gui \
--disable-gif \
@@ -51,6 +50,7 @@ build() {
--disable-fribidi \
--disable-libdv \
--disable-musepack \
+ --disable-mp3lib \
--language=all \
--disable-esd \
--disable-mga \
@@ -58,7 +58,8 @@ build() {
--enable-debug \
--enable-radio \
--enable-radio-capture \
- --extra-cflags="-I/usr/lib/live-media -O2" \
+ --extra-cflags="-I/usr/lib/live-media -O2 -fno-PIC -fno-PIE" \
+ --extra-ldflags="-nopie" \
--disable-nemesi \
--enable-freetype \
--enable-xvmc \
@@ -77,8 +78,11 @@ package() {
rm -rf "$pkgdir"/usr/share/mplayer/font
}
md5sums="39dd55f30eb5403f219a606e79a6648a MPlayer-1.1.1.tar.xz
+6a7826f8cb9ac1b99a0842f202b22cfc cdio-includes.patch
01bcc935a6b429347e8e77e1a70bf2b2 x11-libs.patch"
sha256sums="ce8fc7c3179e6a57eb3a58cb7d1604388756b8a61764cc93e095e7aff3798c76 MPlayer-1.1.1.tar.xz
+bd29643fd26b09f3c0af1fb3c5ad61a5697eb3a29bc3e92ec5a2bc1a91038fdf cdio-includes.patch
924ae52abeaad41e4d14c0af82d52a6d65985f3b1c77fa432ed04a5ccbc4c24c x11-libs.patch"
sha512sums="06371d47b02caec83c7662f6bb4a827eafb7f3309f6cda959a0f49b647df031166a6e7c5d530b57b580104289ee260aa96f3f43cbfffcef816cea776b0d5aed0 MPlayer-1.1.1.tar.xz
+5ab1e62614201cfbf8fe5a111cfc24c895bae6c755f4fcb23c5d990b13dc9e7671c60e275690c80c0cc5ca9139f12afdf16b15900e56043f797ffa17521d35f0 cdio-includes.patch
bba012c5a116cbc6715955a0a563c89a33a1d8ad3c44301a083ce65296ba9112a88a58e38c874d9347f9c3133054e62bd16d3b3367383f207ee40ddae105081c x11-libs.patch"
diff --git a/main/mplayer/cdio-includes.patch b/main/mplayer/cdio-includes.patch
new file mode 100644
index 000000000..911ea2622
--- /dev/null
+++ b/main/mplayer/cdio-includes.patch
@@ -0,0 +1,43 @@
+Index: configure
+===================================================================
+--- ./configure (revision 35421)
++++ ./configure (working copy)
+@@ -5968,8 +5968,8 @@
+ cat > $TMPC << EOF
+ #include <stdio.h>
+ #include <cdio/version.h>
+-#include <cdio/cdda.h>
+-#include <cdio/paranoia.h>
++#include <cdio/paranoia/cdda.h>
++#include <cdio/paranoia/paranoia.h>
+ int main(void) {
+ void *test = cdda_verbose_set;
+ printf("%s\n", CDIO_VERSION);
+Index: gui/win32/interface.c
+===================================================================
+--- ./gui/win32/interface.c (revision 35421)
++++ ./gui/win32/interface.c (working copy)
+@@ -24,7 +24,7 @@
+ #include "config.h"
+
+ #if defined(CONFIG_LIBCDIO)
+-#include <cdio/cdda.h>
++#include <cdio/paranoia/cdda.h>
+ #elif defined(CONFIG_CDDA)
+ #include <cdda_interface.h>
+ #endif
+Index: stream/stream_cdda.c
+===================================================================
+--- ./stream/stream_cdda.c (revision 35421)
++++ ./stream/stream_cdda.c (working copy)
+@@ -21,8 +21,8 @@
+ #include <cdda_interface.h>
+ #include <cdda_paranoia.h>
+ #else
+-#include <cdio/cdda.h>
+-#include <cdio/paranoia.h>
++#include <cdio/paranoia/cdda.h>
++#include <cdio/paranoia/paranoia.h>
+ #endif
+ #include <stdio.h>
+ #include <stdlib.h>