commit 2bb2f3d686bb808f5f55765a439db72adcfb5555
Author: Jan Rękorajski <[email protected]>
Date: Sun Mar 4 11:11:22 2018 +0000
- remove CFLAGS defs that conflict with the code
cflags.patch | 19 +++++++++++++++++++
mplayer.spec | 4 ++--
2 files changed, 21 insertions(+), 2 deletions(-)
---
diff --git a/mplayer.spec b/mplayer.spec
index 3c9f954..51605ff 100644
--- a/mplayer.spec
+++ b/mplayer.spec
@@ -148,7 +148,7 @@ Patch10: %{name}-ldflags.patch
Patch11: %{name}-altivec.patch
Patch12: %{name}-check-byteswap.patch
Patch13: %{name}-visibility-hidden-fix.patch
-
+Patch14: cflags.patch
Patch15: %{name}-live555-async.patch
Patch17: %{name}-gsm.patch
@@ -413,7 +413,7 @@ cp -f etc/codecs.conf etc/codecs.win32.conf
%patch11 -p1
%patch12 -p1
%patch13 -p1
-
+%patch14 -p1
%patch15 -p1
%patch17 -p1
diff --git a/cflags.patch b/cflags.patch
new file mode 100644
index 0000000..4f693b5
--- /dev/null
+++ b/cflags.patch
@@ -0,0 +1,19 @@
+--- mplayer-export-2018-03-01/configure~ 2018-03-04 10:36:57.000000000
+0000
++++ mplayer-export-2018-03-01/configure 2018-03-04 10:37:44.401480707
+0000
+@@ -2861,14 +2861,9 @@
+ warn_cflags=yes
+ fi
+
+-CFLAGS="-D_ISOC99_SOURCE -I. -Iffmpeg $CFLAGS"
+-HOSTCFLAGS="-D_ISOC99_SOURCE -I. -Iffmpeg -O3"
++CFLAGS="-I. -Iffmpeg $CFLAGS"
++HOSTCFLAGS="-I. -Iffmpeg -O3"
+
+-# On glibc, add some more CPPFLAGS for enabling required functionality.
+-cpp_condition_check features.h "defined __GLIBC__" &&
+- CFLAGS="-D_POSIX_C_SOURCE=200112 -D_XOPEN_SOURCE=600 $CFLAGS" &&
+- HOSTCFLAGS="-D_POSIX_C_SOURCE=200112 -D_XOPEN_SOURCE=600 $HOSTCFLAGS"
+-
+ if cygwin; then
+ CFLAGS="-D_XOPEN_SOURCE=600 $CFLAGS"
+ fi
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/mplayer.git/commitdiff/2bb2f3d686bb808f5f55765a439db72adcfb5555
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
