aboutsummaryrefslogtreecommitdiffstats
path: root/main/vlc
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2013-12-11 15:04:26 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2013-12-11 15:04:26 +0000
commite2917207e28598c888cceeab25a66e06ab58116a (patch)
treeddf8d3c65017b14679efc5cbb6b0174c9c3dc8cc /main/vlc
parenteeee3a2b2d7d73e530bd6d81d682a50c5c543211 (diff)
downloadaports-e2917207e28598c888cceeab25a66e06ab58116a.tar.bz2
aports-e2917207e28598c888cceeab25a66e06ab58116a.tar.xz
main/vlc: fix dbus plugin
Diffstat (limited to 'main/vlc')
-rw-r--r--main/vlc/APKBUILD6
-rw-r--r--main/vlc/dbus-fmaxf.patch14
2 files changed, 19 insertions, 1 deletions
diff --git a/main/vlc/APKBUILD b/main/vlc/APKBUILD
index b2c8fb8e6d..adc91c7d8b 100644
--- a/main/vlc/APKBUILD
+++ b/main/vlc/APKBUILD
@@ -4,7 +4,7 @@ pkgname=vlc
pkgver=2.1.1
_pkgver=${pkgver/_/-}
_ver=${_pkgver%[a-z]}
-pkgrel=1
+pkgrel=2
pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player"
pkgusers="vlc"
pkggroups="vlc"
@@ -78,6 +78,7 @@ source="http://download.videolan.org/pub/videolan/$pkgname/${_ver}/$pkgname-$_pk
vlc.trigger
fix-waitpid-usage.patch
uclibc-define-fminf.patch
+ dbus-fmaxf.patch
uclibc-fix-idn.patch"
_builddir="$srcdir"/$pkgname-$_ver
@@ -234,14 +235,17 @@ md5sums="1331cd853d56762c96afcb92dd498348 vlc-2.1.1.tar.xz
350b30698eb784def7d19446eb1d6c81 vlc.trigger
7b1a482e521b9d6dcdb6710aff51894f fix-waitpid-usage.patch
34bacc70c150bdbe19476d84a76f2849 uclibc-define-fminf.patch
+0f373eaee7e74def94d0dab2be9d0c01 dbus-fmaxf.patch
a57ecdeb28b93c2ac0ade2adff2da2b4 uclibc-fix-idn.patch"
sha256sums="339c92cfb939ef6517b42fce7db59e59f259476d79d15b9b39e9d7f2b966b992 vlc-2.1.1.tar.xz
0639c022dc844fad95eb0246b1d24557641939bbda91af0c700374378d8f054a vlc.trigger
0c802698c215dd2d2ad9a4889b1d46dfd5d6c304d4cd1b34bacb2bacc35dd3c9 fix-waitpid-usage.patch
b16801cca70c0f13830a27146025cc55b947897744d9da1ab713c5f5ce0460a0 uclibc-define-fminf.patch
+3ebb0577b1ef9780eba27cd829c9839b2ddf7729c5a2a81019d08b2c0a7e5b79 dbus-fmaxf.patch
8e15a1c29fed29eeafef4dd37c73cc0da578b40d9d94713ac12a69c101040901 uclibc-fix-idn.patch"
sha512sums="9e6fd36daf750d7f0c06de5fc73b35cf017c6c13f3e54f0ec71e1b8fa8302674d48e72112c552113fea290e788b2832d749f8e06d2212109fca57d9f78bd4c14 vlc-2.1.1.tar.xz
a081dd93248b63724ffb65cde0a00db0e1f3b9a1d47074800d898e39dc71c074b3dd3fa18e5fbc45fa90376e7df6d7ef8689c4253c1d9405868a3f8bbd76adcc vlc.trigger
3c6ff4f25b7e1f0041bc47872a2b59b6c4f8bc1747d6830e9f2d9c35ee75cd2581558a12225070dede37d6a2287b0fc5c089c8f4f8ae26784aa6aded7177bed0 fix-waitpid-usage.patch
0d9310afef1afbf15a19bcc8aa1835416830666d79a5461b45df900afde5b115ec7c18d4bc15d36efe45b912ebb51ceb91cc20ebd0be0ecc4ff3fd0e06dd4a55 uclibc-define-fminf.patch
+b51041adcb16234289c928444a8c03db549640af28cc8dc75f732863bea519141dc36a44f353d2e42d8afde1fd8052faff0b2b661bf04a10c64f1f18f120e87b dbus-fmaxf.patch
24d7ae347a81e05aa2273c180ed76dfb0c8140ef1e4f877a88326fdf37acec0ac8bf1bde98845e40cd57c93fe6e5c186623a6f6f66ed6fe94386826260d88738 uclibc-fix-idn.patch"
diff --git a/main/vlc/dbus-fmaxf.patch b/main/vlc/dbus-fmaxf.patch
new file mode 100644
index 0000000000..09561e604c
--- /dev/null
+++ b/main/vlc/dbus-fmaxf.patch
@@ -0,0 +1,14 @@
+uclibc don't have fmaxf()
+
+--- ./modules/control/dbus/dbus_player.c.orig 2013-12-11 15:00:16.338111047 +0000
++++ ./modules/control/dbus/dbus_player.c 2013-12-11 15:01:48.649150243 +0000
+@@ -179,7 +179,7 @@
+ if( VLC_SUCCESS != DemarshalSetPropertyValue( p_from, &d_dbus_vol ) )
+ return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+
+- playlist_VolumeSet( PL, fmaxf( d_dbus_vol, 0.f ) );
++ playlist_VolumeSet( PL, d_dbus_vol > 0.f ? d_dbus_vol : 0.f );
+
+ REPLY_SEND;
+ }
+