Include GPL code in the FFmpeg plugin during compilation, if the Haiku build

system has been configured to include GPL add-ons. This cannot be switched on
the fly without rebuilding all of the FFmpeg plugin, since the change in the
Jamfile defines will not automatically trigger a rebuild. So if you change your
configuration with regards to --include-gpl-addons, you have to touch config.h
(this commit touches it anyway).


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@32191 a95241bf-73f2-0310-859d-f6bbb57e9c96

src/add-ons/media/plugins/ffmpeg/Jamfile

@@ -85,6 +85,13 @@ if $(TARGET_ARCH) = x86 {
 	HAIKU_FFMPEG_DEFINES += HAVE_VIS=1 ;
 }
 
+if $(INCLUDE_GPL_ADDONS) = 1 {
+	HAIKU_FFMPEG_DEFINES += CONFIG_GPL=1 ;
+} else {
+	HAIKU_FFMPEG_DEFINES += CONFIG_GPL=0 ;
+}
+
+
 HAIKU_FFMPEG_DEFINES = [ FDefines $(HAIKU_FFMPEG_DEFINES) ] ;
 
 SubInclude HAIKU_TOP src add-ons media plugins ffmpeg libavcodec ;

src/add-ons/media/plugins/ffmpeg/config.h

@@ -123,7 +123,7 @@
 #define CONFIG_FFSERVER 0
 #define CONFIG_FFT 1
 #define CONFIG_GOLOMB 1
-#define CONFIG_GPL 0
+//#define CONFIG_GPL 0 // defined in Jamfile depending on build config
 #define CONFIG_GPROF 0
 #define CONFIG_GRAY 0
 #define CONFIG_HARDCODED_TABLES 1

src/add-ons/media/plugins/ffmpeg/libavcodec/x86/Jamfile

@@ -21,7 +21,6 @@ if $(HAIKU_FFMPEG_USE_MMX) = 1 {
 		dsputil_mmx.c
 		dsputilenc_mmx.c
 		fdct_mmx.c
-#		idct_mmx.c # GPL
 		idct_mmx_xvid.c
 		motion_est_mmx.c
 		mpegvideo_mmx.c
@@ -34,6 +33,11 @@ if $(HAIKU_FFMPEG_USE_MMX) = 1 {
 		fft_mmx.nasm
 		dsputil_yasm.nasm
 	;
+	if $(INCLUDE_GPL_ADDONS) = 1 {
+		mmxSources +=
+			idct_mmx.c
+		;
+	}
 }
 
 local sseSources = ;
@@ -44,9 +48,13 @@ if $(HAIKU_FFMPEG_USE_SSSE3) = 1 {
 		idct_sse2_xvid.c
 		vp3dsp_sse2.c
 		vp6dsp_sse2.c
-#		h264_idct_sse2.nasm # GPL
-#		h264_deblock_sse2.nasm # GPL
 	;
+	if $(INCLUDE_GPL_ADDONS) = 1 {
+		sseSources +=
+			h264_idct_sse2.nasm
+			h264_deblock_sse2.nasm
+		;
+	}
 }
 
 local amdSources = ;