summaryrefslogtreecommitdiffstats
path: root/main/vlc
diff options
context:
space:
mode:
authorTimo Teräs <timo.teras@iki.fi>2013-12-27 08:44:56 +0000
committerTimo Teräs <timo.teras@iki.fi>2013-12-27 08:46:14 +0000
commit3a49fdeb3ed63e395e1790f540c43ce889318fff (patch)
tree9581df37888dc1f1608f9fd13483b907304ca228 /main/vlc
parentf99b01c987ab7ad85f63756f58235217726fd971 (diff)
downloadaports-3a49fdeb3ed63e395e1790f540c43ce889318fff.tar.bz2
aports-3a49fdeb3ed63e395e1790f540c43ce889318fff.tar.xz
main/vlc: minor rpi tuning
Diffstat (limited to 'main/vlc')
-rw-r--r--main/vlc/APKBUILD30
-rw-r--r--main/vlc/raspberrypi-mpeg4.patch10
2 files changed, 31 insertions, 9 deletions
diff --git a/main/vlc/APKBUILD b/main/vlc/APKBUILD
index dfa91a819..9aaa5da5d 100644
--- a/main/vlc/APKBUILD
+++ b/main/vlc/APKBUILD
@@ -4,7 +4,7 @@ pkgname=vlc
pkgver=2.1.2
_pkgver=${pkgver/_/-}
_ver=${_pkgver%[a-z]}
-pkgrel=0
+pkgrel=1
pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player"
pkgusers="vlc"
pkggroups="vlc"
@@ -75,11 +75,13 @@ makedepends="
xdg-utils
"
source="http://download.videolan.org/pub/videolan/$pkgname/${_ver}/$pkgname-$_pkgver.tar.xz
- vlc.trigger
+ raspberrypi-mpeg4.patch
fix-waitpid-usage.patch
uclibc-define-fminf.patch
dbus-fmaxf.patch
- uclibc-fix-idn.patch"
+ uclibc-fix-idn.patch
+
+ vlc.trigger"
_builddir="$srcdir"/$pkgname-$_ver
prepare() {
@@ -97,6 +99,8 @@ prepare() {
}
build() {
+ local _arch_opts=
+
cd "$_builddir"
sed -e 's:/usr/share/fonts/truetype/freefont/FreeSerifBold.ttf:/usr/share/fonts/TTF/DejaVuSerif-Bold.ttf:' \
-i modules/text_renderer/freetype.c
@@ -106,6 +110,10 @@ build() {
export CFLAGS="$CFLAGS -D_GNU_SOURCE"
export CXXFLAGS="$CXXFLAGS -fpermissive"
+ case "$CARCH" in
+ arm*) _arch_opts="--enable-omxil --enable-omxil-vout --enable-rpi-omxil" ;;
+ esac
+
LUA=lua5.2 \
LUAC=luac5.2 \
./configure \
@@ -149,6 +157,7 @@ build() {
--enable-wma-fixed \
--enable-x264 \
--enable-xvideo \
+ $_arch_opts \
|| return 1
make || return 1
@@ -232,20 +241,23 @@ daemon() {
}
md5sums="fb6787ad749aadcfaeab3471939b3426 vlc-2.1.2.tar.xz
-350b30698eb784def7d19446eb1d6c81 vlc.trigger
+8de1e959ef80806cf9f0c3918d8ba9b3 raspberrypi-mpeg4.patch
7b1a482e521b9d6dcdb6710aff51894f fix-waitpid-usage.patch
34bacc70c150bdbe19476d84a76f2849 uclibc-define-fminf.patch
0f373eaee7e74def94d0dab2be9d0c01 dbus-fmaxf.patch
-a57ecdeb28b93c2ac0ade2adff2da2b4 uclibc-fix-idn.patch"
+a57ecdeb28b93c2ac0ade2adff2da2b4 uclibc-fix-idn.patch
+350b30698eb784def7d19446eb1d6c81 vlc.trigger"
sha256sums="219b812be1bc2eba40faa86419d0aa2c479a7380af8af216e8bfa22eb6fc8ec4 vlc-2.1.2.tar.xz
-0639c022dc844fad95eb0246b1d24557641939bbda91af0c700374378d8f054a vlc.trigger
+cde16969d902df62756aa412841a894451fb22333d9cd365cca8cfd2aded7a80 raspberrypi-mpeg4.patch
0c802698c215dd2d2ad9a4889b1d46dfd5d6c304d4cd1b34bacb2bacc35dd3c9 fix-waitpid-usage.patch
b16801cca70c0f13830a27146025cc55b947897744d9da1ab713c5f5ce0460a0 uclibc-define-fminf.patch
3ebb0577b1ef9780eba27cd829c9839b2ddf7729c5a2a81019d08b2c0a7e5b79 dbus-fmaxf.patch
-8e15a1c29fed29eeafef4dd37c73cc0da578b40d9d94713ac12a69c101040901 uclibc-fix-idn.patch"
+8e15a1c29fed29eeafef4dd37c73cc0da578b40d9d94713ac12a69c101040901 uclibc-fix-idn.patch
+0639c022dc844fad95eb0246b1d24557641939bbda91af0c700374378d8f054a vlc.trigger"
sha512sums="24ea51befb30ec2e4f796866bf086d36e809cb97bf04203a4637518c91a3035fa38a8e778aaf6fb3481db49d19236ae88bcbf31e1e4f7ae79b9d7bcc3cf037af vlc-2.1.2.tar.xz
-a081dd93248b63724ffb65cde0a00db0e1f3b9a1d47074800d898e39dc71c074b3dd3fa18e5fbc45fa90376e7df6d7ef8689c4253c1d9405868a3f8bbd76adcc vlc.trigger
+1f988588f7d7699e36d371e2ed2df918d476697737fab8c29a5833858e428651200939339a6f31fe6b608cc4387f53dbc6b2581bc453746c1d178c2af943ec60 raspberrypi-mpeg4.patch
3c6ff4f25b7e1f0041bc47872a2b59b6c4f8bc1747d6830e9f2d9c35ee75cd2581558a12225070dede37d6a2287b0fc5c089c8f4f8ae26784aa6aded7177bed0 fix-waitpid-usage.patch
0d9310afef1afbf15a19bcc8aa1835416830666d79a5461b45df900afde5b115ec7c18d4bc15d36efe45b912ebb51ceb91cc20ebd0be0ecc4ff3fd0e06dd4a55 uclibc-define-fminf.patch
b51041adcb16234289c928444a8c03db549640af28cc8dc75f732863bea519141dc36a44f353d2e42d8afde1fd8052faff0b2b661bf04a10c64f1f18f120e87b dbus-fmaxf.patch
-24d7ae347a81e05aa2273c180ed76dfb0c8140ef1e4f877a88326fdf37acec0ac8bf1bde98845e40cd57c93fe6e5c186623a6f6f66ed6fe94386826260d88738 uclibc-fix-idn.patch"
+24d7ae347a81e05aa2273c180ed76dfb0c8140ef1e4f877a88326fdf37acec0ac8bf1bde98845e40cd57c93fe6e5c186623a6f6f66ed6fe94386826260d88738 uclibc-fix-idn.patch
+a081dd93248b63724ffb65cde0a00db0e1f3b9a1d47074800d898e39dc71c074b3dd3fa18e5fbc45fa90376e7df6d7ef8689c4253c1d9405868a3f8bbd76adcc vlc.trigger"
diff --git a/main/vlc/raspberrypi-mpeg4.patch b/main/vlc/raspberrypi-mpeg4.patch
new file mode 100644
index 000000000..cbeea441b
--- /dev/null
+++ b/main/vlc/raspberrypi-mpeg4.patch
@@ -0,0 +1,10 @@
+--- vlc-2.1.2.orig/modules/codec/omxil/omxil_core.c
++++ vlc-2.1.2/modules/codec/omxil/omxil_core.c
+@@ -202,6 +202,7 @@
+ {
+ #ifdef RPI_OMX
+ { "video_decoder.avc", "OMX.broadcom.video_decode" },
++ { "video_decoder.mpeg4", "OMX.broadcom.video_decode" },
+ { "iv_renderer", "OMX.broadcom.video_render" },
+ #endif
+ { 0, 0 }