diff options
| author | pingplug | 2018-11-02 16:48:06 +0800 |
|---|---|---|
| committer | pingplug | 2018-11-02 16:48:06 +0800 |
| commit | 62d1aaff204f01b9facff8df4c8d5957477e72c4 (patch) | |
| tree | d5a8edc91ad789f41f424fb8ffef1ab9741a584e /dep.patch | |
| parent | 2c78c4702271f4886361e763f869172bbfc0e88b (diff) | |
| download | aur-62d1aaff204f01b9facff8df4c8d5957477e72c4.tar.gz | |
remove fdk-aac
Diffstat (limited to 'dep.patch')
| -rw-r--r-- | dep.patch | 33 |
1 files changed, 6 insertions, 27 deletions
diff --git a/dep.patch b/dep.patch index f4c81f39831b..385f2aa27880 100644 --- a/dep.patch +++ b/dep.patch @@ -1,16 +1,7 @@ diff -ruN cinelerra-gg/cinelerra-5.1/configure.ac cinelerra-gg-new/cinelerra-5.1/configure.ac ---- cinelerra-gg/cinelerra-5.1/configure.ac 2018-06-28 16:38:54.885096000 +0800 -+++ cinelerra-gg-new/cinelerra-5.1/configure.ac 2018-06-28 16:41:45.598921556 +0800 -@@ -525,7 +525,7 @@ - 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_LIB([fdk], [fdk-aac], [aacDecoder_AncDataInit]) - CHECK_HEADERS([fdk], [fdk headers], [fdk-aac/genericStds.h]) - CHECK_LIB([jbig], [jbig], [jbg_dec_init]) - CHECK_LIB([vdpau], [vdpau], [vdp_device_create_x11]) -@@ -649,8 +649,8 @@ +--- cinelerra-gg/cinelerra-5.1/configure.ac 2018-11-02 16:41:41.523009718 +0800 ++++ cinelerra-gg-new/cinelerra-5.1/configure.ac 2018-11-02 16:42:45.643716648 +0800 +@@ -669,8 +669,8 @@ EXRIStream() : Imf::IStream("mypath") {} }; class EXROStream : public Imf::OStream { public: EXROStream() : Imf::OStream("mypath") {} }; @@ -20,8 +11,8 @@ diff -ruN cinelerra-gg/cinelerra-5.1/configure.ac cinelerra-gg-new/cinelerra-5.1 + RESULT="$HAVE_openexr" if test "x$RESULT" = "xyes"; then SHARED_openexr="$LIBS" - CFG_CFLAGS+=" -I/usr/include/OpenEXR" -@@ -658,9 +658,9 @@ + CFG_CFLAGS+=" -I/usr/include/OpenEXR -I/usr/local/include/OpenEXR" +@@ -678,9 +678,9 @@ LIBS="$saved_LIBS" CXXFLAGS="$saved_CXXFLAGS" AC_LANG_POP(C++) @@ -33,7 +24,7 @@ diff -ruN cinelerra-gg/cinelerra-5.1/configure.ac cinelerra-gg-new/cinelerra-5.1 # build global_config OBJDIR=`uname -m` -@@ -704,7 +704,7 @@ +@@ -724,7 +724,7 @@ libtheora/libogg libtheora/libvorbis ; do lib=`dirname $dep`; needs=`basename $dep` eval pkg_lib="\$PKG_$lib"; eval needs_lib="\$HAVE_$needs"; @@ -42,15 +33,3 @@ diff -ruN cinelerra-gg/cinelerra-5.1/configure.ac cinelerra-gg-new/cinelerra-5.1 eval "PKG_$needs=yes" fi done -diff -ruN cinelerra-gg/cinelerra-5.1/thirdparty/Makefile cinelerra-gg-new/cinelerra-5.1/thirdparty/Makefile ---- cinelerra-gg/cinelerra-5.1/thirdparty/Makefile 2018-06-28 16:38:55.658446000 +0800 -+++ cinelerra-gg-new/cinelerra-5.1/thirdparty/Makefile 2018-06-28 16:39:14.942212329 +0800 -@@ -141,7 +141,7 @@ - $(call inc_path,fdk,libSYS) \ - $(call inc_path,fdk,libSYS/include)" \ - --extra-cxxflags="-D__STDC_CONSTANT_MACROS" \ -- --pkg-config=true \ -+ --pkg-config=/usr/bin/pkg-config \ - --extra-libs="-Wl,--start-group \ - $(call ld_path,twolame,libtwolame/.libs) \ - $(call ld_path,lame,libmp3lame/.libs) \ |