re-enable libvorbis (and patch it)

matham · Oct 10, 2024 · 313c2a5 · 313c2a5
1 parent 9174ce3
commit 313c2a5
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 9 deletions.
diff --git a/.ci/apple_libvorbis_cpusubtype.patch b/.ci/apple_libvorbis_cpusubtype.patch
@@ -0,0 +1,15 @@
+--- configure.orig	2024-10-09 23:11:57
++++ configure	2024-10-09 23:12:43
+@@ -12840,9 +12840,9 @@
+ 		CFLAGS="-O3 -Wall -Wextra -ffast-math -D__NO_MATH_INLINES -fsigned-char $sparc_cpu"
+ 		PROFILE="-pg -g -O3 -D__NO_MATH_INLINES -fsigned-char $sparc_cpu" ;;
+ 	*-*-darwin*)
+-		DEBUG="-DDARWIN -fno-common -force_cpusubtype_ALL -Wall -g -O0 -fsigned-char"
+-		CFLAGS="-DDARWIN -fno-common -force_cpusubtype_ALL -Wall -g -O3 -ffast-math -fsigned-char"
+-		PROFILE="-DDARWIN -fno-common -force_cpusubtype_ALL -Wall -g -pg -O3 -ffast-math -fsigned-char";;
++		DEBUG="-DDARWIN -fno-common -Wall -g -O0 -fsigned-char"
++		CFLAGS="-DDARWIN -fno-common -Wall -g -O3 -ffast-math -fsigned-char"
++		PROFILE="-DDARWIN -fno-common -Wall -g -pg -O3 -ffast-math -fsigned-char";;
+ 	*-*-os2*)
+ 		# Use -W instead of -Wextra because gcc on OS/2 is an old version.
+ 		DEBUG="-g -Wall -W -D_REENTRANT -D__NO_MATH_INLINES -fsigned-char"
diff --git a/.ci/build_wheels_osx.sh b/.ci/build_wheels_osx.sh
@@ -241,13 +241,14 @@ make
 make install
 
 
-# cd "$SRC_PATH"
-# curl -LO "http://downloads.xiph.org/releases/vorbis/libvorbis-$LIBVORBIS_VERSION.tar.gz"
-# tar xzvf "libvorbis-$LIBVORBIS_VERSION.tar.gz"
-# cd "libvorbis-$LIBVORBIS_VERSION"
-# ./configure --prefix="$BUILD_PATH" --with-ogg="$BUILD_PATH" --enable-shared --host=$ARCH2-darwin
-# make
-# make install
+cd "$SRC_PATH"
+curl -LO "http://downloads.xiph.org/releases/vorbis/libvorbis-$LIBVORBIS_VERSION.tar.gz"
+tar xzvf "libvorbis-$LIBVORBIS_VERSION.tar.gz"
+cd "libvorbis-$LIBVORBIS_VERSION"
+patch -p1 < "$base_dir/.ci/apple_libvorbis_cpusubtype.patch"
+./configure --prefix="$BUILD_PATH" --with-ogg="$BUILD_PATH" --enable-shared --host=$ARCH2-darwin
+make
+make install
 
 
 cd "$SRC_PATH";
@@ -297,7 +298,7 @@ fi
 
 ./configure --prefix="$BUILD_PATH" --extra-cflags="$CFLAGS" --extra-cxxflags="$CXXFLAGS" --bindir="$BUILD_PATH/bin" \
   --enable-gpl --enable-libmp3lame --enable-libx264 --enable-libx265 --enable-libfdk_aac --enable-nonfree \
-  --enable-libass --enable-libtheora --enable-libfreetype --enable-libopus --enable-libvpx \
+  --enable-libass --enable-libvorbis --enable-libtheora --enable-libfreetype --enable-libopus --enable-libvpx \
   --enable-openssl --enable-shared --pkg-config-flags="--static" --disable-libxcb --disable-libxcb-shm \
   --disable-libxcb-xfixes --disable-libxcb-shape --disable-xlib "${arg[@]}"
 make

diff --git a/.github/workflows/pythonapp.yml b/.github/workflows/pythonapp.yml
@@ -19,7 +19,7 @@ jobs:
       FFMPEG_ROOT: ~/ff_deps/ffmpeg
     strategy:
       matrix:
-        python: [ '3.7', '3.8', '3.9', '3.10', '3.11', '3.12', '3.13-dev']
+        python: [ '3.7', '3.8', '3.9', '3.10', '3.11', '3.12', '3.13']
     steps:
     - uses: actions/checkout@v3
     - name: Set up Python ${{ matrix.python }}