From: Good Guy Date: Sun, 21 Oct 2018 21:55:32 +0000 (-0600) Subject: remove non-gpl components X-Git-Url: https://git.cinelerra-gg.org/git/?p=goodguy%2Fhistory.git;a=commitdiff_plain;h=8b0e73a6d3623764c261f64f5f3e96349d1f9032 remove non-gpl components --- diff --git a/cinelerra-5.1/configure.ac b/cinelerra-5.1/configure.ac index f521b167..2c61e826 100644 --- a/cinelerra-5.1/configure.ac +++ b/cinelerra-5.1/configure.ac @@ -176,11 +176,6 @@ PKG_3RD([esound],[no], .libs/libesddsp.a ], [ . ]) -PKG_3RD([fdk],[auto], - [fdk-aac-0.1.5], - [ .libs/libfdk-aac.a ], - [ libAACdec/include libAACenc/include libSYS/include ]) - PKG_3RD([ffmpeg],[yes], [ffmpeg-4.0], [ libavutil/libavutil.a \ @@ -552,8 +547,6 @@ CHECK_LIB([encore], [encore], [encore]) CHECK_HEADERS([encore], [encore headers], [encore.h]) CHECK_LIB([giflib], [gif], [DGifOpen]) CHECK_HEADERS([giflib], [gif lib headers], [gif_lib.h]) -CHECK_LIB([fdk], [fdk-aac], [faacDecInit]) -CHECK_HEADERS([fdk], [fdk headers], [fdk-aac/genericStds.h]) CHECK_LIB([jbig], [jbig], [jbg_dec_init]) CHECK_LIB([vdpau], [vdpau], [vdp_device_create_x11]) @@ -725,7 +718,7 @@ if test "x$WANT_CIN_3RDPARTY" != "xno"; then # order matters for dep in \ ffmpeg/twolame ffmpeg/lame ffmpeg/openjpeg \ - ffmpeg/libvorbis ffmpeg/libtheora ffmpeg/x264 ffmpeg/x265 ffmpeg/fdk \ + ffmpeg/libvorbis ffmpeg/libtheora ffmpeg/x264 ffmpeg/x265 \ libiec61883/libraw1394 libavc1394/librom1394 \ openexr/ilmbase ilmbase/libogg \ libtheora/libogg libtheora/libvorbis ; do @@ -758,7 +751,6 @@ PKG_PROVIDE([djbfft]) PKG_PROVIDE([encore]) PKG_PROVIDE([audiofile],[$WANT_ESOUND]) PKG_PROVIDE([esound],[$WANT_ESOUND]) -PKG_PROVIDE([fdk]) PKG_PROVIDE([ffmpeg]) PKG_PROVIDE([fftw]) PKG_PROVIDE([flac]) diff --git a/cinelerra-5.1/ffmpeg/audio/acc256k.pro b/cinelerra-5.1/ffmpeg/audio/acc256k.pro index 8b8eafd1..4e4b7003 100644 --- a/cinelerra-5.1/ffmpeg/audio/acc256k.pro +++ b/cinelerra-5.1/ffmpeg/audio/acc256k.pro @@ -1,3 +1,3 @@ -mov libfdk_aac +mov aac strict -2 b 256000 diff --git a/cinelerra-5.1/ffmpeg/audio/faststart_h264.mp4 b/cinelerra-5.1/ffmpeg/audio/faststart_h264.mp4 index d5db4f8b..9f85007b 100644 --- a/cinelerra-5.1/ffmpeg/audio/faststart_h264.mp4 +++ b/cinelerra-5.1/ffmpeg/audio/faststart_h264.mp4 @@ -1,2 +1,2 @@ -fmp4 libfdk_aac +fmp4 aac strict -2 diff --git a/cinelerra-5.1/ffmpeg/audio/faststart_h264.qt b/cinelerra-5.1/ffmpeg/audio/faststart_h264.qt index 5b897a5f..dcddcf31 100644 --- a/cinelerra-5.1/ffmpeg/audio/faststart_h264.qt +++ b/cinelerra-5.1/ffmpeg/audio/faststart_h264.qt @@ -1,2 +1,2 @@ -fqt libfdk_aac +fqt aac strict -2 diff --git a/cinelerra-5.1/ffmpeg/audio/h264.mp4 b/cinelerra-5.1/ffmpeg/audio/h264.mp4 index 7a2d70ea..c6b21ac3 100644 --- a/cinelerra-5.1/ffmpeg/audio/h264.mp4 +++ b/cinelerra-5.1/ffmpeg/audio/h264.mp4 @@ -1 +1 @@ -mp4 libfdk_aac +mp4 aac diff --git a/cinelerra-5.1/ffmpeg/audio/h265.mp4 b/cinelerra-5.1/ffmpeg/audio/h265.mp4 index adcf1d7f..5f3589b3 100644 --- a/cinelerra-5.1/ffmpeg/audio/h265.mp4 +++ b/cinelerra-5.1/ffmpeg/audio/h265.mp4 @@ -1,2 +1,2 @@ -mp4 libfdk_aac +mp4 aac strict -2 diff --git a/cinelerra-5.1/ffmpeg/audio/mov.mov b/cinelerra-5.1/ffmpeg/audio/mov.mov index 207c7b64..d75048a6 100644 --- a/cinelerra-5.1/ffmpeg/audio/mov.mov +++ b/cinelerra-5.1/ffmpeg/audio/mov.mov @@ -1 +1 @@ -mov libfdk_aac +mov aac diff --git a/cinelerra-5.1/ffmpeg/audio/mp4.qt b/cinelerra-5.1/ffmpeg/audio/mp4.qt index 207c7b64..d75048a6 100644 --- a/cinelerra-5.1/ffmpeg/audio/mp4.qt +++ b/cinelerra-5.1/ffmpeg/audio/mp4.qt @@ -1 +1 @@ -mov libfdk_aac +mov aac diff --git a/cinelerra-5.1/ffmpeg/audio/passes1and2_h264.mp4 b/cinelerra-5.1/ffmpeg/audio/passes1and2_h264.mp4 index ab6b0cc5..b2d4ac72 100644 --- a/cinelerra-5.1/ffmpeg/audio/passes1and2_h264.mp4 +++ b/cinelerra-5.1/ffmpeg/audio/passes1and2_h264.mp4 @@ -1,2 +1,2 @@ -fmp4 libfdk_aac +fmp4 aac b=128k diff --git a/cinelerra-5.1/ffmpeg/audio/passes1and2_h265.mp4 b/cinelerra-5.1/ffmpeg/audio/passes1and2_h265.mp4 index ab6b0cc5..b2d4ac72 100644 --- a/cinelerra-5.1/ffmpeg/audio/passes1and2_h265.mp4 +++ b/cinelerra-5.1/ffmpeg/audio/passes1and2_h265.mp4 @@ -1,2 +1,2 @@ -fmp4 libfdk_aac +fmp4 aac b=128k diff --git a/cinelerra-5.1/ffmpeg/audio/stereo_with_h264.youtube b/cinelerra-5.1/ffmpeg/audio/stereo_with_h264.youtube index d084baf5..07a6de3d 100644 --- a/cinelerra-5.1/ffmpeg/audio/stereo_with_h264.youtube +++ b/cinelerra-5.1/ffmpeg/audio/stereo_with_h264.youtube @@ -1,4 +1,4 @@ -mp4 libfdk_aac +mp4 aac # Recommended sample rates: 48000Hz or 96000Hz # Stereo is 384k; change to 128k for mono, 512k for 5.1 b=384k diff --git a/cinelerra-5.1/plugins/fonts/ariblk.ttf b/cinelerra-5.1/plugins/fonts/ariblk.ttf deleted file mode 100755 index b51c8c26..00000000 Binary files a/cinelerra-5.1/plugins/fonts/ariblk.ttf and /dev/null differ diff --git a/cinelerra-5.1/plugins/fonts/comic.ttf b/cinelerra-5.1/plugins/fonts/comic.ttf deleted file mode 100755 index d17e1be6..00000000 Binary files a/cinelerra-5.1/plugins/fonts/comic.ttf and /dev/null differ diff --git a/cinelerra-5.1/plugins/fonts/comicbd.ttf b/cinelerra-5.1/plugins/fonts/comicbd.ttf deleted file mode 100755 index 75be5048..00000000 Binary files a/cinelerra-5.1/plugins/fonts/comicbd.ttf and /dev/null differ diff --git a/cinelerra-5.1/plugins/fonts/georgia.ttf b/cinelerra-5.1/plugins/fonts/georgia.ttf deleted file mode 100755 index c24d59b6..00000000 Binary files a/cinelerra-5.1/plugins/fonts/georgia.ttf and /dev/null differ diff --git a/cinelerra-5.1/plugins/fonts/georgiab.ttf b/cinelerra-5.1/plugins/fonts/georgiab.ttf deleted file mode 100755 index 2cfce236..00000000 Binary files a/cinelerra-5.1/plugins/fonts/georgiab.ttf and /dev/null differ diff --git a/cinelerra-5.1/plugins/fonts/georgiai.ttf b/cinelerra-5.1/plugins/fonts/georgiai.ttf deleted file mode 100755 index 27abc9de..00000000 Binary files a/cinelerra-5.1/plugins/fonts/georgiai.ttf and /dev/null differ diff --git a/cinelerra-5.1/plugins/fonts/georgiaz.ttf b/cinelerra-5.1/plugins/fonts/georgiaz.ttf deleted file mode 100755 index f60957ef..00000000 Binary files a/cinelerra-5.1/plugins/fonts/georgiaz.ttf and /dev/null differ diff --git a/cinelerra-5.1/plugins/fonts/impact.ttf b/cinelerra-5.1/plugins/fonts/impact.ttf deleted file mode 100755 index 114e6c19..00000000 Binary files a/cinelerra-5.1/plugins/fonts/impact.ttf and /dev/null differ diff --git a/cinelerra-5.1/plugins/fonts/verdana.ttf b/cinelerra-5.1/plugins/fonts/verdana.ttf deleted file mode 100755 index 754a9b7b..00000000 Binary files a/cinelerra-5.1/plugins/fonts/verdana.ttf and /dev/null differ diff --git a/cinelerra-5.1/plugins/fonts/verdanab.ttf b/cinelerra-5.1/plugins/fonts/verdanab.ttf deleted file mode 100755 index a668f13b..00000000 Binary files a/cinelerra-5.1/plugins/fonts/verdanab.ttf and /dev/null differ diff --git a/cinelerra-5.1/plugins/fonts/verdanai.ttf b/cinelerra-5.1/plugins/fonts/verdanai.ttf deleted file mode 100755 index fedb5134..00000000 Binary files a/cinelerra-5.1/plugins/fonts/verdanai.ttf and /dev/null differ diff --git a/cinelerra-5.1/plugins/fonts/verdanaz.ttf b/cinelerra-5.1/plugins/fonts/verdanaz.ttf deleted file mode 100755 index 8be20913..00000000 Binary files a/cinelerra-5.1/plugins/fonts/verdanaz.ttf and /dev/null differ diff --git a/cinelerra-5.1/plugins/fonts/webdings.ttf b/cinelerra-5.1/plugins/fonts/webdings.ttf deleted file mode 100755 index 511a319b..00000000 Binary files a/cinelerra-5.1/plugins/fonts/webdings.ttf and /dev/null differ diff --git a/cinelerra-5.1/thirdparty/Makefile b/cinelerra-5.1/thirdparty/Makefile index d1555b9d..2da7d7ee 100644 --- a/cinelerra-5.1/thirdparty/Makefile +++ b/cinelerra-5.1/thirdparty/Makefile @@ -107,14 +107,10 @@ esound.cfg_vars+= AUDIOFILE_LIBS="$(call ld_path,audiofile,libaudiofile/.libs)" esound.cfg_params= --enable-shared=no --with-pic esound.mak_vars+= CFLAGS="" esound.ldflags=" -lm -lstdc++" -#fdk.cfg_vars= ./autogen.sh ; CFLAGS+=" -Wno-narrowing" CXXFLAGS+=" -Wno-narrowing" -fdk.cfg_params= --enable-shared=no -fdk.mak_params= ; for f in $(call bld_path,fdk,/lib*/include); do ln -s . $$$$f/fdk-aac; done fftw.cfg_params= --disable-fortran --enable-shared=no ffmpeg.cfg_params= \ --enable-pthreads --enable-gpl \ --disable-ffplay --disable-vaapi \ - $(call if_pkg,fdk,--enable-libfdk-aac) \ $(call if_pkg,twolame,--enable-libtwolame) \ $(call if_pkg,openjpeg,--enable-libopenjpeg) \ $(call if_pkg,lame,--enable-libmp3lame) \ @@ -123,7 +119,6 @@ ffmpeg.cfg_params= \ $(call if_pkg,libvpx,--enable-libvpx) \ $(call if_pkg,x264,--enable-libx264) \ $(call if_pkg,x265,--enable-libx265) \ - --enable-nonfree \ --extra-cflags="\ $(call inc_path,twolame,libtwolame) \ $(call inc_path,lame,include) \ @@ -135,11 +130,7 @@ ffmpeg.cfg_params= \ $(call inc_path,libvpx) \ $(call inc_path,x264) \ $(call inc_path,x265) \ - $(call inc_path,x265,source) \ - $(call inc_path,fdk,libAACdec) \ - $(call inc_path,fdk,libAACenc) \ - $(call inc_path,fdk,libSYS) \ - $(call inc_path,fdk,libSYS/include)" \ + $(call inc_path,x265,source)" \ --extra-cxxflags="-D__STDC_CONSTANT_MACROS" \ --pkg-config=true \ --extra-libs="-Wl,--start-group \ @@ -153,7 +144,6 @@ ffmpeg.cfg_params= \ $(call ld_path,libvpx) \ $(call ld_path,x264) \ $(call ld_path,x265) \ - $(call ld_path,fdk,.libs) \ -Wl,--end-group -lm -lstdc++ -pthread \ $(EXTRA_LIBS)" $(FFMPEG_EXTRA_CFG) \ @@ -282,8 +272,7 @@ $(call rules,$(call std-build,djbfft)) $(call rules,$(call std-build,audiofile)) $(call rules,$(call std-build,encore)) $(call rules,$(call std-build,esound,audiofile)) -$(call rules,$(call std-build,fdk)) -$(call rules,$(call std-build,ffmpeg, fdk twolame lame openjpeg opus libtheora x264 x265 libvpx)) +$(call rules,$(call std-build,ffmpeg, twolame lame openjpeg opus libtheora x264 x265 libvpx)) $(call rules,$(call std-build,fftw)) $(call rules,$(call std-build,flac,libogg)) $(call rules,$(call std-build,giflib))