test

Author: System233

build-libass.sh

@@ -17,7 +17,7 @@ echo -e "\n[Build fribidi]"
 cd $SRC_DIR/fribidi
 NOCONFIGURE=1 ./autogen.sh
 CFLAGS="$CFLAGS -DHAVE_STRINGIZE" ./configure "--host=${BUILD_ARCH}-windows" --prefix=$INSTALL_PREFIX --disable-shared --enable-static --disable-dependency-tracking 
-make -C lib install -j1 CFLAGS="$CFLAGS -DHAVE_STRINGIZE"
+make -C lib install -j$(nproc) CFLAGS="$CFLAGS -DHAVE_STRINGIZE"
 make install-data-am
 
 

build.sh

@@ -45,38 +45,6 @@ apply-patch zlib zlib.patch
 apply-patch FFmpeg ffmpeg.patch
 apply-patch harfbuzz harfbuzz.patch
 
-if [ "$BUILD_LICENSE" == "gpl" ]; then
-
-    apply-patch x265_git x265_git-${BUILD_TYPE}.patch
-
-    if [ "$BUILD_TYPE" == "static" ]; then
-        X265_ARGS="-DSTATIC_LINK_CRT=ON"
-        ENABLE_SHARED=OFF
-    else
-        X265_ARGS="-DSTATIC_LINK_CRT=OFF"
-        ENABLE_SHARED=ON
-    fi
-
-    if [ "$BUILD_ARCH" == arm ]; then
-        apply-patch x265_git x265_git-arm.patch
-    fi
-
-    git -C x265_git fetch --tags
-    ./build-cmake-dep.sh x265_git/source -DCMAKE_SYSTEM_NAME=Windows -DENABLE_SHARED=$ENABLE_SHARED -DENABLE_CLI=OFF $X265_ARGS
-    add_ffargs "--enable-libx265"
-
-    if [ "$BUILD_TYPE" == "shared" ]; then
-        apply-patch x264 x264-${BUILD_TYPE}.patch
-    fi
-    if [[ "$BUILD_ARCH" =~ arm ]]; then
-        X264_ARGS="--disable-asm"
-    fi
-
-    INSTALL_TARGET=install-lib-${BUILD_TYPE} ./build-make-dep.sh x264 --enable-${BUILD_TYPE} $X264_ARGS
-    add_ffargs "--enable-libx264"
-
-fi
-
 ./build-make-dep.sh nv-codec-headers
 
 ./build-cmake-dep.sh zlib -DZLIB_BUILD_EXAMPLES=OFF
@@ -92,6 +60,14 @@ if [ -n "$ENABLE_LIBHARFBUZZ" ]; then
     add_ffargs "--enable-libharfbuzz"
 fi
 
+if [ -n "$ENABLE_LIBASS" ]; then
+    apply-patch fribidi fribidi.patch
+    ./build-libass.sh
+    add_ffargs "--enable-libass"
+fi
+
+
+
 if [ -n "$ENABLE_SDL" ]; then
     ./build-cmake-dep.sh SDL
     add_ffargs "--enable-sdl"
@@ -131,10 +107,36 @@ if [ -n "$ENABLE_LIBWEBP" ]; then
     add_ffargs "--enable-libwebp"
 fi
 
+if [ "$BUILD_LICENSE" == "gpl" ]; then
+
+    apply-patch x265_git x265_git-${BUILD_TYPE}.patch
+
+    if [ "$BUILD_TYPE" == "static" ]; then
+        X265_ARGS="-DSTATIC_LINK_CRT=ON"
+        ENABLE_SHARED=OFF
+    else
+        X265_ARGS="-DSTATIC_LINK_CRT=OFF"
+        ENABLE_SHARED=ON
+    fi
+
+    if [ "$BUILD_ARCH" == arm ]; then
+        apply-patch x265_git x265_git-arm.patch
+    fi
+
+    git -C x265_git fetch --tags
+    ./build-cmake-dep.sh x265_git/source -DCMAKE_SYSTEM_NAME=Windows -DENABLE_SHARED=$ENABLE_SHARED -DENABLE_CLI=OFF $X265_ARGS
+    add_ffargs "--enable-libx265"
+
+    if [ "$BUILD_TYPE" == "shared" ]; then
+        apply-patch x264 x264-${BUILD_TYPE}.patch
+    fi
+    if [[ "$BUILD_ARCH" =~ arm ]]; then
+        X264_ARGS="--disable-asm"
+    fi
+
+    INSTALL_TARGET=install-lib-${BUILD_TYPE} ./build-make-dep.sh x264 --enable-${BUILD_TYPE} $X264_ARGS
+    add_ffargs "--enable-libx264"
 
-if [ -n "$ENABLE_LIBASS" ]; then
-    ./build-libass.sh
-    add_ffargs "--enable-libass"
 fi
 
 ./build-ffmpeg.sh FFmpeg $FF_ARGS

patches/fribidi.patch

@@ -0,0 +1,64 @@
+diff --git a/Makefile.am b/Makefile.am
+index 8c516fb..88827ef 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -4,11 +4,11 @@
+ ACLOCAL_AMFLAGS = -I m4
+ 
+ ## The order of subdirs is important, don't change without a reason.
+-SUBDIRS = gen.tab lib bin doc test
++SUBDIRS = lib bin doc test
+ 
+ EXTRA_DIST = autogen.sh ChangeLog.old \
+ 	meson.build meson_options.txt bin/meson.build doc/meson.build \
+-	gen.tab/meson.build lib/meson.build test/meson.build \
++	lib/meson.build test/meson.build \
+ 	test/test-runner.py test/unicode-conformance/meson.build \
+         README.md
+ 
+diff --git a/configure.ac b/configure.ac
+index 9be44d0..7abb3d2 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -168,7 +168,6 @@ AC_SUBST(ENABLE_SHARED_FALSE)
+ AC_CONFIG_FILES([fribidi.pc
+ 		 lib/fribidi-config.h
+ 		 Makefile
+-		 gen.tab/Makefile
+ 		 lib/Makefile
+ 		 bin/Makefile
+ 		 doc/Makefile
+diff --git a/lib/Makefile.am b/lib/Makefile.am
+index 22b680a..8dcbfd0 100644
+--- a/lib/Makefile.am
++++ b/lib/Makefile.am
+@@ -56,28 +56,11 @@ libfribidi_la_SOURCES =	\
+ 
+ libfribidi_la_CPPFLAGS = @FRIBIDI_CPPFLAGS@ -DFRIBIDI_BUILD
+ 
+-GENERATEDSOURCES = \
+-		fribidi-unicode-version.h \
+-		arabic-shaping.tab.i \
+-		bidi-type.tab.i \
+-		joining-type.tab.i \
+-		mirroring.tab.i \
+-		brackets.tab.i \
+-		brackets-type.tab.i 
+-
+-BUILT_SOURCES = \
+-		$(GENERATEDSOURCES) \
+-		fribidi-config.h
+ 
+-$(GENERATEDSOURCES):
+-	@(cd $(top_builddir)/gen.tab && \
+-	$(MAKE) $(AM_MAKEFLAGS) $@) && \
+-	(test -f $@ || mv $(top_builddir)/gen.tab/$@ .)
++BUILT_SOURCES = fribidi-config.h
+ 
+ # re-generate all built sources:
+ gen:
+-	@(cd $(top_builddir)/gen.tab && \
+-	$(MAKE) $(AM_MAKEFLAGS) $@) && \
+ 	$(RM) $(BUILT_SOURCES)
+ 	$(MAKE) $(AM_MAKEFLAGS) $(BUILT_SOURCES)
+