Intel Linux building again.

CMakeLists.txt

@@ -30,7 +30,7 @@ if(NOT DEFINED KANGAROO_ARCH)
 	set(KANGAROO_ARCH x86_64)
 endif()
 
-set(BUILD_DIR ${CMAKE_SOURCE_DIR}/build/${KANGAROO_OS}/${KANGAROO_ARCH})
+set(BUILD_DIR ${CMAKE_SOURCE_DIR}/.builddir/${KANGAROO_OS}/${KANGAROO_ARCH})
 
 
 set(SINGE_SOURCE
@@ -269,7 +269,7 @@ target_include_directories(${CMAKE_PROJECT_NAME} PUBLIC
 
 
 target_link_directories(${CMAKE_PROJECT_NAME} PUBLIC
-	build/lib
+	${BUILD_DIR}/lib
 )
 
 
@@ -297,7 +297,10 @@ if(WIN32)
 		-lssp
 	)
 else()
-	set(LIB_LIST)
+	set(LIB_LIST
+		-lX11
+		-lvdpau
+	)
 endif()
 target_link_libraries(${CMAKE_PROJECT_NAME}
 	-Wl,--start-group
@@ -306,17 +309,17 @@ target_link_libraries(${CMAKE_PROJECT_NAME}
 	${BUILD_DIR}/lib/libavdevice.a
 	${BUILD_DIR}/lib/libavfilter.a
 	${BUILD_DIR}/lib/libavformat.a
-	${BUILD_DIR}/lib/libavif.a
+#	${BUILD_DIR}/lib/libavif.a
 	${BUILD_DIR}/lib/libavutil.a
-	${BUILD_DIR}/lib/libbrotlicommon-static.a
-	${BUILD_DIR}/lib/libbrotlidec-static.a
+#	${BUILD_DIR}/lib/libbrotlicommon-static.a
+#	${BUILD_DIR}/lib/libbrotlidec-static.a
 	${BUILD_DIR}/lib/libbz2_static.a
-	${BUILD_DIR}/lib/libdav1d.a
+#	${BUILD_DIR}/lib/libdav1d.a
 	${BUILD_DIR}/lib/libffms2.a
 	${BUILD_DIR}/lib/libfreetype.a
 	${BUILD_DIR}/lib/libharfbuzz.a
-	${BUILD_DIR}/lib/libhwy.a
-	${BUILD_DIR}/lib/libjxl_dec.a
+#	${BUILD_DIR}/lib/libhwy.a
+#	${BUILD_DIR}/lib/libjxl_dec.a
 	${BUILD_DIR}/lib/liblzma.a
 	${BUILD_DIR}/lib/libogg.a
 	${BUILD_DIR}/lib/libopus.a
@@ -330,7 +333,7 @@ target_link_libraries(${CMAKE_PROJECT_NAME}
 	${BUILD_DIR}/lib/libSDL2_ttf.a
 	${BUILD_DIR}/lib/libswresample.a
 	${BUILD_DIR}/lib/libswscale.a
-	${BUILD_DIR}/lib/libtiff.a
+#	${BUILD_DIR}/lib/libtiff.a
 	${BUILD_DIR}/lib/libwavpack.a
 	${BUILD_DIR}/lib/libwebp.a
 	${BUILD_DIR}/lib/libwebpdemux.a
@@ -344,4 +347,3 @@ target_link_libraries(${CMAKE_PROJECT_NAME}
 
 
 install(TARGETS ${CMAKE_PROJECT_NAME})
-

build-all.sh

@@ -119,9 +119,9 @@ function buildAll() {
 		-DSDL2IMAGE_SAMPLES=off \
 		-DSDL2IMAGE_TESTS=off \
 		-DSDL2IMAGE_VENDORED=on \
-		-DSDL2IMAGE_AVIF=on \
-		-DSDL2IMAGE_JXL=on \
-		-DSDL2IMAGE_TIF=on \
+		-DSDL2IMAGE_AVIF=off \
+		-DSDL2IMAGE_JXL=off \
+		-DSDL2IMAGE_TIF=off \
 		-DSDL2IMAGE_WEBP=on \
 		-DSDL2_DIR=${G_TARGET}/lib/cmake/SDL2 \
 		..
@@ -199,6 +199,7 @@ function buildAll() {
 		--disable-network \
 		--disable-devices \
 		--disable-doc \
+		--disable-programs \
 		--enable-gpl \
 		--enable-version3 \
 		--extra-ldflags="-L${G_TARGET}/lib -l:libz.a -l:liblzma.a" \
@@ -210,6 +211,14 @@ function buildAll() {
 	popd
 
 	pushd thirdparty/ffms2
+	#libtoolize --force
+	#aclocal
+	#autoheader
+	#automake --force-missing --add-missing
+	#autoupdate
+	#autoconf
+	#./autogen.sh
+	#make distclean || true
 	clearAndEnterBuild
 	../configure \
 		--prefix=${G_TARGET} \
@@ -223,7 +232,7 @@ function buildAll() {
 	popd
 
 	# === Known FFMPEG Types ===
-	createExtensionHeader "${G_TARGET}/bin/ffmpeg" > ${G_GENERATED}/extensions.h
+	createExtensionHeader ffmpeg > ${G_GENERATED}/extensions.h
 
 	# === Overlay Font ===
 	createEmbeddedImage font
@@ -259,8 +268,8 @@ function buildAll() {
 	createEmbeddedBinary assets/FreeSansBold.ttf ${G_GENERATED}/FreeSansBold_ttf.h FREESANSBOLD_TTF_H
 
 	# === Singe Menu Background Video ===
-	ffmpeg -i "assets/Singe Engine Intro.mpg" -filter:v 'crop=ih/3*4:ih' -vf scale=720:480 -c:v libx264 -c:a aac ${G_TARGET}/temp1.mkv
-	ffmpeg -i assets/180503_01_PurpleGrid.mp4 -filter:v 'crop=ih/3*4:ih' -vf scale=720:480 -c:v libx264 -c:a aac ${G_TARGET}/temp2.mkv
+	ffmpeg -i "assets/Singe Engine Intro.mpg" -filter:v 'crop=ih/3*4:ih' -vf scale=720:480 -c:v libx264 -c:a aac -f matroska ${G_TARGET}/temp1.mkv
+	ffmpeg -i assets/180503_01_PurpleGrid.mp4 -filter:v 'crop=ih/3*4:ih' -vf scale=720:480 -c:v libx264 -c:a aac -f matroska ${G_TARGET}/temp2.mkv
 	ffmpeg -f concat -safe 0 -i <(echo -e "file ${G_TARGET}/temp1.mkv\nfile ${G_TARGET}/temp2.mkv\n") -c copy ${G_TARGET}/menuBackground.mkv
 	createEmbeddedBinary ${G_TARGET}/menuBackground.mkv ${G_GENERATED}/menuBackground_mkv.h MENUBACKGROUND_MKV_H
 	rm ${G_TARGET}/temp1.mkv ${G_TARGET}/temp2.mkv ${G_TARGET}/menuBackground.mkv
@@ -409,10 +418,10 @@ function outputLicense() {
 }
 
 
-#buildAll linux x86
+buildAll linux x86
 buildAll linux x86_64
 #buildAll macos aarch64
 #buildAll macos x86   #***TODO*** Needs older SDL2
 #buildAll macos x86_64   #***TODO*** Needs older SDL2
-#buildAll windows x86
-#buildAll windows x86_64
+buildAll windows x86
+buildAll windows x86_64

thirdparty/SDL2_mixer/external/opusfile/CMakeLists.txt

@@ -5,8 +5,11 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake")
 include(OpusFilePackageVersion)
 get_package_version(PACKAGE_VERSION PROJECT_VERSION)
 string(REPLACE "." ";" PROJECT_VERSION_LIST ${PROJECT_VERSION})
-list(GET PROJECT_VERSION_LIST 0 PROJECT_VERSION_MAJOR)
-list(GET PROJECT_VERSION_LIST 1 PROJECT_VERSION_MINOR)
+#list(GET PROJECT_VERSION_LIST 0 PROJECT_VERSION_MAJOR)
+#list(GET PROJECT_VERSION_LIST 1 PROJECT_VERSION_MINOR)
+
+set(PROJECT_VERSION_MAJOR 0)
+set(PROJECT_VERSION_MINOR 0)
 
 project(OpusFile
   VERSION ${PROJECT_VERSION}

thirdparty/ffms2/configure.ac

@@ -1,4 +1,4 @@
-AC_PREREQ([2.58])
+AC_PREREQ([2.71])
 AC_INIT([ffms2],[esyscmd([sh version.sh])])
 AC_CONFIG_SRCDIR([src/core/ffms.cpp])
 AC_CONFIG_MACRO_DIR([m4])
@@ -11,8 +11,7 @@ VERSION_INFO="5:0:0"
 AC_MSG_CHECKING([if debug build is enabled])
 
 AC_ARG_ENABLE([debug],
-        [AC_HELP_STRING([--enable-debug],
-            [Enable debug build. [default=no]])],
+        [AS_HELP_STRING([--enable-debug],[Enable debug build. [default=no]])],
         [enable_debug=yes],
         [enable_debug=no]
         )
@@ -34,8 +33,7 @@ if test -z "$CXXFLAGS"; then
 fi
 
 AC_ARG_ENABLE([avisynth],
-        [AC_HELP_STRING([--enable-avisynth],
-            [Enable AviSynth+ plugin. [default=no]])],
+        [AS_HELP_STRING([--enable-avisynth],[Enable AviSynth+ plugin. [default=no]])],
         [enable_avisynth=yes],
         [enable_avisynth=no]
         )
@@ -58,7 +56,7 @@ AS_CASE([$host],
             AC_ENABLE_SHARED
             AC_DISABLE_STATIC])
 
-AC_PROG_LIBTOOL
+LT_INIT
 
 if echo "$host" | $GREP "cygwin" >/dev/null 2>&1 && test "$enable_shared" = "yes"; then
     AC_MSG_ERROR([Shared build is broken on cygwin.