Aren
/
haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
This commit is contained in:
Stephan Aßmus 2009-08-07 17:19:32 +00:00
parent c06d7b2c40
commit 38d967a3ea
3 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/add-ons/media/plugins/ffmpeg/Jamfile
View File

@ -24,7 +24,7 @@ Addon ffmpeg :
gfx_conv_c_lookup.cpp
# gfx_conv_mmx.cpp
gfx_util.cpp
:
:
libavformat.a
libavcodec.a
libavcodec_$(TARGET_ARCH).a
@ -72,7 +72,7 @@ if $(TARGET_ARCH) = x86 {
HAIKU_FFMPEG_DEFINES += ARCH_PPC=1 ;
HAIKU_FFMPEG_DEFINES += ARCH_SPARC=0 ;
HAIKU_FFMPEG_DEFINES += HAVE_AMD3DNOW=0 HAVE_AMD3DNOWEXT=0 ;
HAIKU_FFMPEG_DEFINES += HAVE_MMX=0 HAVE_MMX2=0 HAVE_SSE=0 HAVE_SSSE3=0 ;
HAIKU_FFMPEG_DEFINES += HAVE_MMX=0 HAVE_MMX2=0 HAVE_SSE=0 HAVE_SSSE3=0 ;
HAIKU_FFMPEG_DEFINES += HAVE_ALTIVEC=1 ;
HAIKU_FFMPEG_DEFINES += HAVE_VIS=0 ;
} else if $(TARGET_ARCH) = sparc {
@ -80,11 +80,18 @@ if $(TARGET_ARCH) = x86 {
HAIKU_FFMPEG_DEFINES += ARCH_PPC=0 ;
HAIKU_FFMPEG_DEFINES += ARCH_SPARC=1 ;
HAIKU_FFMPEG_DEFINES += HAVE_AMD3DNOW=0 HAVE_AMD3DNOWEXT=0 ;
HAIKU_FFMPEG_DEFINES += HAVE_MMX=0 HAVE_MMX2=0 HAVE_SSE=0 HAVE_SSSE3=0 ;
HAIKU_FFMPEG_DEFINES += HAVE_MMX=0 HAVE_MMX2=0 HAVE_SSE=0 HAVE_SSSE3=0 ;
HAIKU_FFMPEG_DEFINES += HAVE_ALTIVEC=0 ;
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 ;

2
src/add-ons/media/plugins/ffmpeg/config.h
View File

@ -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

14
src/add-ons/media/plugins/ffmpeg/libavcodec/x86/Jamfile
View File

@ -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 = ;