main/vlc: fix build

- disable sse (it seems to not go well with pic on new gcc)
- patch the font file to correct file (since upgrade to 2.1.0)
- update my patch to not fail on musl

2 files changed, 16 insertions, 7 deletions

diff --git a/main/vlc/APKBUILD b/main/vlc/APKBUILD
index 149d422f11..d065fbd846 100644
--- a/main/vlc/APKBUILD
+++ b/main/vlc/APKBUILD
@@ -4,7 +4,7 @@ pkgname=vlc
 pkgver=2.1.0
 _pkgver=${pkgver/_/-}
 _ver=${_pkgver%[a-z]}
-pkgrel=4
+pkgrel=5
 pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player"
 pkgusers="vlc"
 pkggroups="vlc"
@@ -95,10 +95,10 @@ prepare() {
 	./bootstrap
 }
 
-build ()
-{
+build() {
 	cd "$_builddir"
-	sed -i -e 's:/usr/share/fonts/truetype/freefont/FreeSerifBold.ttf:/usr/share/fonts/TTF/DejaVuSerif-Bold.ttf:' modules/misc/freetype.c
+	sed -e 's:/usr/share/fonts/truetype/freefont/FreeSerifBold.ttf:/usr/share/fonts/TTF/DejaVuSerif-Bold.ttf:' \
+		-i modules/text_renderer/freetype.c
 
 	# -fpermissive is needed due to zlib 1.2.6 changing
 	# void* to gzFile on gz*() functions
@@ -112,6 +112,7 @@ build ()
 		--host=$CHOST \
 		--prefix=/usr \
 		--disable-mmx \
+		--disable-sse \
 		--disable-nls \
 		--disable-optimizations \
 		--disable-rpath \
@@ -231,16 +232,16 @@ daemon() {
 
 md5sums="8c77bda671821f5b9ede96b6816e2ade  vlc-2.1.0.tar.xz
 350b30698eb784def7d19446eb1d6c81  vlc.trigger
-8facb4e18f2c72afbaa94e2dee21bbf6  fix-waitpid-usage.patch
+7b1a482e521b9d6dcdb6710aff51894f  fix-waitpid-usage.patch
 34bacc70c150bdbe19476d84a76f2849  uclibc-define-fminf.patch
 a57ecdeb28b93c2ac0ade2adff2da2b4  uclibc-fix-idn.patch"
 sha256sums="d2177daa31786acf1e961b2f63429797a8c62c090e5359bcc7929a1ba5fe41f7  vlc-2.1.0.tar.xz
 0639c022dc844fad95eb0246b1d24557641939bbda91af0c700374378d8f054a  vlc.trigger
-bf9ca2b2f1f4d29ee5e929227e2be0567048902bf8cd1bafdbec008a2768ab3a  fix-waitpid-usage.patch
+0c802698c215dd2d2ad9a4889b1d46dfd5d6c304d4cd1b34bacb2bacc35dd3c9  fix-waitpid-usage.patch
 b16801cca70c0f13830a27146025cc55b947897744d9da1ab713c5f5ce0460a0  uclibc-define-fminf.patch
 8e15a1c29fed29eeafef4dd37c73cc0da578b40d9d94713ac12a69c101040901  uclibc-fix-idn.patch"
 sha512sums="abf397e1382289d579fec3dc540885c45ba055f158f7c248c5de27a7c50dac5a4c317145c4a786ed3819a9199fc304fa8f43ccde8c33c2938d40c805e7e9b124  vlc-2.1.0.tar.xz
 a081dd93248b63724ffb65cde0a00db0e1f3b9a1d47074800d898e39dc71c074b3dd3fa18e5fbc45fa90376e7df6d7ef8689c4253c1d9405868a3f8bbd76adcc  vlc.trigger
-ef239b6f0ff497c7e2b290044de1164a17aec9b72205158cbb6b309bee19e843953eb63092026390a3ff2dff7ba290151ec3e124b8a5b4ccc2ac8c2d4ce2ed8d  fix-waitpid-usage.patch
+3c6ff4f25b7e1f0041bc47872a2b59b6c4f8bc1747d6830e9f2d9c35ee75cd2581558a12225070dede37d6a2287b0fc5c089c8f4f8ae26784aa6aded7177bed0  fix-waitpid-usage.patch
 0d9310afef1afbf15a19bcc8aa1835416830666d79a5461b45df900afde5b115ec7c18d4bc15d36efe45b912ebb51ceb91cc20ebd0be0ecc4ff3fd0e06dd4a55  uclibc-define-fminf.patch
 24d7ae347a81e05aa2273c180ed76dfb0c8140ef1e4f877a88326fdf37acec0ac8bf1bde98845e40cd57c93fe6e5c186623a6f6f66ed6fe94386826260d88738  uclibc-fix-idn.patch"
diff --git a/main/vlc/fix-waitpid-usage.patch b/main/vlc/fix-waitpid-usage.patch
index 5d19ddb1d6..01b9e1c501 100644
--- a/main/vlc/fix-waitpid-usage.patch
+++ b/main/vlc/fix-waitpid-usage.patch
@@ -31,6 +31,14 @@
      if (p_sys->peeked)
 --- vlc-2.1.0.orig/src/posix/netconf.c	2013-06-24 21:00:39.000000000 +0300
 +++ vlc-2.1.0/src/posix/netconf.c	2013-10-07 14:05:49.603654117 +0300
+@@ -28,6 +28,7 @@
+ 
+ #include <sys/types.h>
+ #include <sys/wait.h>
++#include <errno.h>
+ #include <fcntl.h>
+ #include <spawn.h>
+ #include <unistd.h>
 @@ -93,7 +93,7 @@
          while (len < sizeof (buf));