Re: [libav-devel] [PATCH] build: Special-case handling of SDL CFLAGS

2017-03-06 Thread Martin Storsjö

On Thu, 2 Mar 2017, Diego Biurrun wrote:


SDL adds some "special" CFLAGS that interfere with building normal
binaries. Capture those CFLAGS separately and avoid adding them to
the general CFLAGS.
---
configure | 8 +++-
1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/configure b/configure
index 4eab439..7035f11 100755
--- a/configure
+++ b/configure
@@ -4795,7 +4795,13 @@ if enabled nvenc; then
require_cpp_condition nvEncodeAPI.h "NVENCAPI_MAJOR_VERSION >= 6"
fi

-check_pkg_config sdl "sdl >= 1.2.1 sdl < 1.3.0" SDL_events.h SDL_PollEvent
+# SDL is "special" and adds some CFLAGS that should not pollute anything else.
+if enabled avplay; then
+CFLAGS_SAVE=$CFLAGS
+check_pkg_config sdl "sdl >= 1.2.1 sdl < 1.3.0" SDL_events.h SDL_PollEvent 
&&
+sdl_cflags=$pkg_cflags
+CFLAGS=$CFLAGS_SAVE
+fi

! disabled pod2man   && check_cmd pod2man --help && enable pod2man   || 
disable pod2man
! disabled texi2html && check_cmd texi2html -version && enable texi2html || 
disable texi2html
--
2.1.4


This seems ok to me, although I don't have a setup handy for reproducing 
the issue with building with SDL for mingw.


// Martin
___
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel

Re: [libav-devel] [PATCH] build: Special-case handling of SDL CFLAGS

2017-03-06 Thread Diego Biurrun
On Thu, Mar 02, 2017 at 02:57:36PM +0100, Diego Biurrun wrote:
> SDL adds some "special" CFLAGS that interfere with building normal
> binaries. Capture those CFLAGS separately and avoid adding them to
> the general CFLAGS.
> ---
>  configure | 8 +++-
>  1 file changed, 7 insertions(+), 1 deletion(-)

ping

Diego
___
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel

[libav-devel] [PATCH] build: Special-case handling of SDL CFLAGS

2017-03-02 Thread Diego Biurrun
SDL adds some "special" CFLAGS that interfere with building normal
binaries. Capture those CFLAGS separately and avoid adding them to
the general CFLAGS.
---
 configure | 8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/configure b/configure
index 4eab439..7035f11 100755
--- a/configure
+++ b/configure
@@ -4795,7 +4795,13 @@ if enabled nvenc; then
 require_cpp_condition nvEncodeAPI.h "NVENCAPI_MAJOR_VERSION >= 6"
 fi
 
-check_pkg_config sdl "sdl >= 1.2.1 sdl < 1.3.0" SDL_events.h SDL_PollEvent
+# SDL is "special" and adds some CFLAGS that should not pollute anything else.
+if enabled avplay; then
+CFLAGS_SAVE=$CFLAGS
+check_pkg_config sdl "sdl >= 1.2.1 sdl < 1.3.0" SDL_events.h SDL_PollEvent 
&&
+sdl_cflags=$pkg_cflags
+CFLAGS=$CFLAGS_SAVE
+fi
 
 ! disabled pod2man   && check_cmd pod2man --help && enable pod2man   || 
disable pod2man
 ! disabled texi2html && check_cmd texi2html -version && enable texi2html || 
disable texi2html
-- 
2.1.4

___
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel