Mercurial > mplayer.hg

changeset 21588:490dc8ba9ea4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Get rid on -DGNU_SOURCE for internal code, imported libs should be fixed ASAP, too, though
author reimar
date Tue, 12 Dec 2006 20:29:30 +0000
parents f671a3aa7456
children 17b45d55dc44
files configure libaf/Makefile libass/Makefile libmpcodecs/Makefile
diffstat 4 files changed, 2 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/configure	Tue Dec 12 19:17:47 2006 +0000
+++ b/configure	Tue Dec 12 20:29:30 2006 +0000
@@ -4600,7 +4600,7 @@
     _inc_extra="$_inc_extra `$_sdlconfig --cflags | sed s/-Dmain=SDL_main//`"
   else
     _libs_mplayer="$_libs_mplayer `$_sdlconfig --libs`"
-    _inc_extra="$_inc_extra `$_sdlconfig --cflags`"
+    _inc_extra="$_inc_extra `$_sdlconfig --cflags | sed s/-D_GNU_SOURCE=1//`"
   fi
   _vosrc="$_vosrc vo_sdl.c"
   _vomodules="sdl $_vomodules"
--- a/libaf/Makefile	Tue Dec 12 19:17:47 2006 +0000
+++ b/libaf/Makefile	Tue Dec 12 20:29:30 2006 +0000
@@ -32,8 +32,6 @@
 SRCS-$(CONFIG_LIBAVCODEC)    += af_lavcresample.c
 SRCS-$(CONFIG_LIBAVCODEC_SO) += af_lavcresample.c
 
-CFLAGS  = -D_GNU_SOURCE
-
 CFLAGS-$(CONFIG_LIBAVUTIL)   += -I../libavutil
 CFLAGS-$(CONFIG_LIBAVCODEC)  += -I../libavcodec
 
--- a/libass/Makefile	Tue Dec 12 19:17:47 2006 +0000
+++ b/libass/Makefile	Tue Dec 12 20:29:30 2006 +0000
@@ -13,6 +13,6 @@
        ass_library.c \
        ass_font.c \
 
-CFLAGS  = -I../libmpcodecs -D_GNU_SOURCE
+CFLAGS  = -I../libmpcodecs
 
 include ../mpcommon.mak
--- a/libmpcodecs/Makefile	Tue Dec 12 19:17:47 2006 +0000
+++ b/libmpcodecs/Makefile	Tue Dec 12 20:29:30 2006 +0000
@@ -157,7 +157,6 @@
           -I../libmpdemux \
           -I../stream \
           -I../loader \
-          -D_GNU_SOURCE \
 
 CFLAGS-$(CONFIG_LIBAVUTIL)    +=  -I../libavutil
 CFLAGS-$(CONFIG_LIBAVCODEC)   +=  -I../libavcodec