diff options
| author | Bartłomiej Piotrowski <b@bpiotrowski.pl> | 2013-09-26 15:48:07 +0200 |
|---|---|---|
| committer | Bartłomiej Piotrowski <b@bpiotrowski.pl> | 2013-09-26 15:48:07 +0200 |
| commit | 5439919afc7fc34e82c619693bfa913d52b26fda (patch) | |
| tree | ea046bc2f5b9dba0e16724ba9509e6e835ed23e7 | |
| parent | 73a54576d1203ac707c7634e25a3730c2ef2f9a6 (diff) | |
| download | aports-5439919afc7fc34e82c619693bfa913d52b26fda.tar.bz2 aports-5439919afc7fc34e82c619693bfa913d52b26fda.tar.xz | |
main/vlc: define fminf in src/audio_output/volume.c
| -rw-r--r-- | main/vlc/APKBUILD | 12 | ||||
| -rw-r--r-- | main/vlc/uclibc-define-fminf.patch | 17 |
2 files changed, 25 insertions, 4 deletions
diff --git a/main/vlc/APKBUILD b/main/vlc/APKBUILD index bc21a50aa8..be3662ed31 100644 --- a/main/vlc/APKBUILD +++ b/main/vlc/APKBUILD @@ -70,7 +70,8 @@ makedepends=" " source="http://download.videolan.org/pub/videolan/$pkgname/${_ver}/$pkgname-$_pkgver.tar.xz vlc.trigger - uclibc-inhibit-spawn.patch" + uclibc-inhibit-spawn.patch + uclibc-define-fminf.patch" _builddir="$srcdir"/$pkgname-$_ver prepare() { @@ -222,10 +223,13 @@ daemon() { md5sums="8c77bda671821f5b9ede96b6816e2ade vlc-2.1.0.tar.xz 350b30698eb784def7d19446eb1d6c81 vlc.trigger -aa338f067d054887c3834a70686fb3f2 uclibc-inhibit-spawn.patch" +aa338f067d054887c3834a70686fb3f2 uclibc-inhibit-spawn.patch +34bacc70c150bdbe19476d84a76f2849 uclibc-define-fminf.patch" sha256sums="d2177daa31786acf1e961b2f63429797a8c62c090e5359bcc7929a1ba5fe41f7 vlc-2.1.0.tar.xz 0639c022dc844fad95eb0246b1d24557641939bbda91af0c700374378d8f054a vlc.trigger -c56d36afe86733715bdf48d9236dd6f807744a0f80ae01391f24d51ab02abfde uclibc-inhibit-spawn.patch" +c56d36afe86733715bdf48d9236dd6f807744a0f80ae01391f24d51ab02abfde uclibc-inhibit-spawn.patch +b16801cca70c0f13830a27146025cc55b947897744d9da1ab713c5f5ce0460a0 uclibc-define-fminf.patch" sha512sums="abf397e1382289d579fec3dc540885c45ba055f158f7c248c5de27a7c50dac5a4c317145c4a786ed3819a9199fc304fa8f43ccde8c33c2938d40c805e7e9b124 vlc-2.1.0.tar.xz a081dd93248b63724ffb65cde0a00db0e1f3b9a1d47074800d898e39dc71c074b3dd3fa18e5fbc45fa90376e7df6d7ef8689c4253c1d9405868a3f8bbd76adcc vlc.trigger -7f285dd070d4998f0af3dd4a4965a7a181fed5e1e52271a5b30d1b72c3d3cd4a9771a7ef6ff9f094ada95b31c3400a34bdf8f29905d30c1ac3b765621d81e6d4 uclibc-inhibit-spawn.patch" +7f285dd070d4998f0af3dd4a4965a7a181fed5e1e52271a5b30d1b72c3d3cd4a9771a7ef6ff9f094ada95b31c3400a34bdf8f29905d30c1ac3b765621d81e6d4 uclibc-inhibit-spawn.patch +0d9310afef1afbf15a19bcc8aa1835416830666d79a5461b45df900afde5b115ec7c18d4bc15d36efe45b912ebb51ceb91cc20ebd0be0ecc4ff3fd0e06dd4a55 uclibc-define-fminf.patch" diff --git a/main/vlc/uclibc-define-fminf.patch b/main/vlc/uclibc-define-fminf.patch new file mode 100644 index 0000000000..7524b7dafe --- /dev/null +++ b/main/vlc/uclibc-define-fminf.patch @@ -0,0 +1,17 @@ +diff -rupN a/src/audio_output/volume.c b/src/audio_output/volume.c +--- a/src/audio_output/volume.c 2013-09-12 17:18:34.000000000 +0200 ++++ b/src/audio_output/volume.c 2013-09-26 15:43:35.889675700 +0200 +@@ -33,6 +33,13 @@ + #include <vlc_aout_volume.h> + #include "aout_internal.h" + ++#ifdef __UCLIBC__ ++float fminf(float a, float b) ++{ ++ return (a < b) ? a : b; ++} ++#endif ++ + struct aout_volume + { + audio_volume_t object; |