From 57b8f876a7a1d790dd32c80def426885ee320116 Mon Sep 17 00:00:00 2001 From: Good Guy Date: Wed, 5 Jan 2022 13:43:39 -0700 Subject: [PATCH] autoconf/autoreconf addition to support aarches64 by Andrew --- cinelerra-5.1/thirdparty/Makefile | 24 +- .../thirdparty/src/libdv-1.0.0.patch0 | 215 ++++++++++++++++++ 2 files changed, 230 insertions(+), 9 deletions(-) create mode 100644 cinelerra-5.1/thirdparty/src/libdv-1.0.0.patch0 diff --git a/cinelerra-5.1/thirdparty/Makefile b/cinelerra-5.1/thirdparty/Makefile index 63adb5be..c97ef0f5 100644 --- a/cinelerra-5.1/thirdparty/Makefile +++ b/cinelerra-5.1/thirdparty/Makefile @@ -185,8 +185,10 @@ ffmpeg.cfg_params= \ cmake_config=echo 'cmake "$$$$@" "$(1)"' > ./configure; chmod +x ./configure; libbthread.cfg_vars?= echo "exec true" > ./configure; chmod +x ./configure; a52dec.mak_params?= ; cd $(call bld_path,a52dec,include); ln -sf . a52dec -a52dec.cfg_vars?= CFLAGS+=" -U__FreeBSD__ $(call inc_path,djbfft)" LIBS+=" $(call ld_path,djbfft)" -a52dec.cfg_params?=--enable-djbfft +a52dec.cflags?= "$(call inc_path,djbfft)" +a52dec.ldflags?= "$(call ld_path,djbfft)" +a52dec.cfg_vars?= CFLAGS+=" -U__FreeBSD__ $(call inc_path,djbfft)" LIBS+=" $(call ld_path,djbfft)"; autoreconf -ifv && automake -caf; +a52dec.cfg_params?=--enable-djbfft --disable-oss djbfft.cfg_vars?=echo "$(call bld_path,djbfft)" > conf-home; \ (CFLAGS="$(CFLAGS)"; $(CFG_VARS)$(if $(CFG_VARS),; )echo "$(CC) $$$$CFLAGS") > conf-cc; \ echo > ./configure; chmod +x ./configure; @@ -212,28 +214,32 @@ mjpegtools.cfg_vars?= ./autogen.sh; mjpegtools.cfg_params?= --enable-shared=no --without-libquicktime --without-libdv \ --without-libpng --without-dga --without-gtk --without-libsdl --without-sdlgfx mjpegtools.mak_params?= all -ladspa.cfg_vars?= CFLAGS+=' -Dinline="" ' +ladspa.cfg_vars?= CFLAGS+=' -Dinline="" '; autoreconf -ifv && automake -caf; ladspa.mak_params?=; $(MAKE) -C ladspa* install DESTDIR=$(call bld_path,ladspa) -libavc1394.cfg_vars?=PKG_CONFIG_PATH=$(call bld_path,libraw1394) +libavc1394.cfg_vars?= PKG_CONFIG_PATH="$(call bld_path,libraw1394)";autoreconf -ifv -I m4 && automake -caf; libavc1394.cflags?="$(call inc_path,libraw1394)" libavc1394.ldflags?="$(call ld_path,libraw1394,src/.libs)" -libavc1394.cfg_params?= --enable-shared=no +libavc1394.cfg_params?= PKG_CONFIG_PATH="$(call bld_path,libraw1394)" --enable-shared=no libavc1394.mak_params?=; cd $(call bld_path,libavc1394); ln -sf ../librom1394/rom1394.h libavc1394/. +libdv.cfg_vars?= autoreconf -ifv -I m4 && automake -caf; libdv.cfg_params?= --disable-gtk --enable-shared=no -libiec61883.cfg_vars?=PKG_CONFIG_PATH=$(call bld_path,libraw1394) +libiec61883.cfg_vars?=PKG_CONFIG_PATH=$(call bld_path,libraw1394); autoreconf -ifv && automake -caf; libiec61883.cflags?="$(call inc_path,libraw1394)" libiec61883.ldflags?="$(call ld_path,libraw1394,src/.libs)" -libiec61883.cfg_params?= --enable-shared=no +libiec61883.cfg_params?= PKG_CONFIG_PATH="$(call bld_path,libraw1394)" --enable-shared=no libiec61883.mak_params?=; cd $(call bld_path,libiec61883,src); ln -sf . libiec61883 libjpeg.cfg_vars?= mkdir build && cd build && $(call cmake_config,..) libjpeg.cfg_params?= -DENABLE_SHARED=no -DCMAKE_INSTALL_LIBDIR=lib libjpeg.mak_params?= -C build all install DESTDIR=$(call bld_path,libjpeg) +libogg.cfg_vars?= autoreconf -ifv -I m4 && automake -caf; libogg.cfg_params?= --enable-shared=no libraw1394.cfg_params?= --enable-shared=no; ln -sf src libraw1394 -libtheora.cfg_vars?=PKG_CONFIG_PATH=$(call bld_path,libogg):$(call bld_path,libvorbis) +libtheora.cfg_vars?=PKG_CONFIG_PATH=$(call bld_path,libogg):$(call bld_path,libvorbis); autoreconf -ifv -I m4 && automake -caf; +libiec61883.cflags?="$(call inc_path,libraw1394)" libtheora.cflags?="$(call inc_path,libogg) $(call inc_path,libvorbis)" libtheora.ldflags?="$(call ld_path,libvorbis,lib/.libs) $(call ld_path,libogg,src/.libs)" libtheora.cfg_params?= --disable-examples --disable-spec --enable-shared=no +libuuid.cfg_vars?= autoreconf -ifv -I m4 && automake -caf; libuuid.cfg_params?=--enable-shared=no libvorbis.cfg_params?= --disable-oggtest --enable-shared=no openjpeg.cfg_params?= -DBUILD_SHARED_LIBS:BOOL=OFF @@ -245,7 +251,7 @@ openexr.cfg_vars?=true; \# openexr.mak_vars?=true; \# opus.cfg_params?= --disable-extra-programs speech_tools.mak_params?=-j1 -tiff.cfg_vars+=LIBS+=" -lpthread" +tiff.cfg_vars+=LIBS+=" -lpthread"; autoreconf -ifv -I m4 && automake -caf; tiff.cfg_params+= --enable-shared=no --disable-zstd $(call if_pkg,libwebp,\ --with-webp-include-dir=$(call pkg_incl,libwebp)\ --with-webp-lib-dir=$(call pkg_libs,libwebp))\ diff --git a/cinelerra-5.1/thirdparty/src/libdv-1.0.0.patch0 b/cinelerra-5.1/thirdparty/src/libdv-1.0.0.patch0 new file mode 100644 index 00000000..bc52dc4f --- /dev/null +++ b/cinelerra-5.1/thirdparty/src/libdv-1.0.0.patch0 @@ -0,0 +1,215 @@ +From 6bc7b5fa3f4a4d120da985f79566713ddc9ca2d7 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= +Date: Wed, 14 Nov 2012 17:44:00 +0100 +Subject: [PATCH 07/14] Don't require libsdl to be installed for autoreconf + +--- + Makefile.am | 2 + + m4/sdl.m4 | 185 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 187 insertions(+) + create mode 100644 m4/sdl.m4 + +diff --git a/Makefile.am b/Makefile.am +index 831bb9b..0ecf95b 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -1,3 +1,5 @@ ++ACLOCAL_AMFLAGS = -I m4 ++ + if HAVE_GTK + gtk_subdirs = playdv + else +diff --git a/m4/sdl.m4 b/m4/sdl.m4 +new file mode 100644 +index 0000000..639eb85 +--- /dev/null ++++ b/m4/sdl.m4 +@@ -0,0 +1,185 @@ ++# Configure paths for SDL ++# Sam Lantinga 9/21/99 ++# stolen from Manish Singh ++# stolen back from Frank Belew ++# stolen from Manish Singh ++# Shamelessly stolen from Owen Taylor ++ ++# serial 1 ++ ++dnl AM_PATH_SDL([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) ++dnl Test for SDL, and define SDL_CFLAGS and SDL_LIBS ++dnl ++AC_DEFUN([AM_PATH_SDL], ++[dnl ++dnl Get the cflags and libraries from the sdl-config script ++dnl ++AC_ARG_WITH(sdl-prefix,[ --with-sdl-prefix=PFX Prefix where SDL is installed (optional)], ++ sdl_prefix="$withval", sdl_prefix="") ++AC_ARG_WITH(sdl-exec-prefix,[ --with-sdl-exec-prefix=PFX Exec prefix where SDL is installed (optional)], ++ sdl_exec_prefix="$withval", sdl_exec_prefix="") ++AC_ARG_ENABLE(sdltest, [ --disable-sdltest Do not try to compile and run a test SDL program], ++ , enable_sdltest=yes) ++ ++ if test x$sdl_exec_prefix != x ; then ++ sdl_config_args="$sdl_config_args --exec-prefix=$sdl_exec_prefix" ++ if test x${SDL_CONFIG+set} != xset ; then ++ SDL_CONFIG=$sdl_exec_prefix/bin/sdl-config ++ fi ++ fi ++ if test x$sdl_prefix != x ; then ++ sdl_config_args="$sdl_config_args --prefix=$sdl_prefix" ++ if test x${SDL_CONFIG+set} != xset ; then ++ SDL_CONFIG=$sdl_prefix/bin/sdl-config ++ fi ++ fi ++ ++ as_save_PATH="$PATH" ++ if test "x$prefix" != xNONE; then ++ PATH="$prefix/bin:$prefix/usr/bin:$PATH" ++ fi ++ AC_PATH_PROG(SDL_CONFIG, sdl-config, no, [$PATH]) ++ PATH="$as_save_PATH" ++ min_sdl_version=ifelse([$1], ,0.11.0,$1) ++ AC_MSG_CHECKING(for SDL - version >= $min_sdl_version) ++ no_sdl="" ++ if test "$SDL_CONFIG" = "no" ; then ++ no_sdl=yes ++ else ++ SDL_CFLAGS=`$SDL_CONFIG $sdl_config_args --cflags` ++ SDL_LIBS=`$SDL_CONFIG $sdl_config_args --libs` ++ ++ sdl_major_version=`$SDL_CONFIG $sdl_config_args --version | \ ++ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` ++ sdl_minor_version=`$SDL_CONFIG $sdl_config_args --version | \ ++ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` ++ sdl_micro_version=`$SDL_CONFIG $sdl_config_args --version | \ ++ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` ++ if test "x$enable_sdltest" = "xyes" ; then ++ ac_save_CFLAGS="$CFLAGS" ++ ac_save_CXXFLAGS="$CXXFLAGS" ++ ac_save_LIBS="$LIBS" ++ CFLAGS="$CFLAGS $SDL_CFLAGS" ++ CXXFLAGS="$CXXFLAGS $SDL_CFLAGS" ++ LIBS="$LIBS $SDL_LIBS" ++dnl ++dnl Now check if the installed SDL is sufficiently new. (Also sanity ++dnl checks the results of sdl-config to some extent ++dnl ++ rm -f conf.sdltest ++ AC_TRY_RUN([ ++#include ++#include ++#include ++#include "SDL.h" ++ ++char* ++my_strdup (char *str) ++{ ++ char *new_str; ++ ++ if (str) ++ { ++ new_str = (char *)malloc ((strlen (str) + 1) * sizeof(char)); ++ strcpy (new_str, str); ++ } ++ else ++ new_str = NULL; ++ ++ return new_str; ++} ++ ++int main (int argc, char *argv[]) ++{ ++ int major, minor, micro; ++ char *tmp_version; ++ ++ /* This hangs on some systems (?) ++ system ("touch conf.sdltest"); ++ */ ++ { FILE *fp = fopen("conf.sdltest", "a"); if ( fp ) fclose(fp); } ++ ++ /* HP/UX 9 (%@#!) writes to sscanf strings */ ++ tmp_version = my_strdup("$min_sdl_version"); ++ if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { ++ printf("%s, bad version string\n", "$min_sdl_version"); ++ exit(1); ++ } ++ ++ if (($sdl_major_version > major) || ++ (($sdl_major_version == major) && ($sdl_minor_version > minor)) || ++ (($sdl_major_version == major) && ($sdl_minor_version == minor) && ($sdl_micro_version >= micro))) ++ { ++ return 0; ++ } ++ else ++ { ++ printf("\n*** 'sdl-config --version' returned %d.%d.%d, but the minimum version\n", $sdl_major_version, $sdl_minor_version, $sdl_micro_version); ++ printf("*** of SDL required is %d.%d.%d. If sdl-config is correct, then it is\n", major, minor, micro); ++ printf("*** best to upgrade to the required version.\n"); ++ printf("*** If sdl-config was wrong, set the environment variable SDL_CONFIG\n"); ++ printf("*** to point to the correct copy of sdl-config, and remove the file\n"); ++ printf("*** config.cache before re-running configure\n"); ++ return 1; ++ } ++} ++ ++],, no_sdl=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) ++ CFLAGS="$ac_save_CFLAGS" ++ CXXFLAGS="$ac_save_CXXFLAGS" ++ LIBS="$ac_save_LIBS" ++ fi ++ fi ++ if test "x$no_sdl" = x ; then ++ AC_MSG_RESULT(yes) ++ ifelse([$2], , :, [$2]) ++ else ++ AC_MSG_RESULT(no) ++ if test "$SDL_CONFIG" = "no" ; then ++ echo "*** The sdl-config script installed by SDL could not be found" ++ echo "*** If SDL was installed in PREFIX, make sure PREFIX/bin is in" ++ echo "*** your path, or set the SDL_CONFIG environment variable to the" ++ echo "*** full path to sdl-config." ++ else ++ if test -f conf.sdltest ; then ++ : ++ else ++ echo "*** Could not run SDL test program, checking why..." ++ CFLAGS="$CFLAGS $SDL_CFLAGS" ++ CXXFLAGS="$CXXFLAGS $SDL_CFLAGS" ++ LIBS="$LIBS $SDL_LIBS" ++ AC_TRY_LINK([ ++#include ++#include "SDL.h" ++ ++int main(int argc, char *argv[]) ++{ return 0; } ++#undef main ++#define main K_and_R_C_main ++], [ return 0; ], ++ [ echo "*** The test program compiled, but did not run. This usually means" ++ echo "*** that the run-time linker is not finding SDL or finding the wrong" ++ echo "*** version of SDL. If it is not finding SDL, you'll need to set your" ++ echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" ++ echo "*** to the installed location Also, make sure you have run ldconfig if that" ++ echo "*** is required on your system" ++ echo "***" ++ echo "*** If you have an old version installed, it is best to remove it, although" ++ echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"], ++ [ echo "*** The test program failed to compile or link. See the file config.log for the" ++ echo "*** exact error that occured. This usually means SDL was incorrectly installed" ++ echo "*** or that you have moved SDL since it was installed. In the latter case, you" ++ echo "*** may want to edit the sdl-config script: $SDL_CONFIG" ]) ++ CFLAGS="$ac_save_CFLAGS" ++ CXXFLAGS="$ac_save_CXXFLAGS" ++ LIBS="$ac_save_LIBS" ++ fi ++ fi ++ SDL_CFLAGS="" ++ SDL_LIBS="" ++ ifelse([$3], , :, [$3]) ++ fi ++ AC_SUBST(SDL_CFLAGS) ++ AC_SUBST(SDL_LIBS) ++ rm -f conf.sdltest ++]) +-- +2.1.4 + -- 2.26.2