ios release scripts updated. also fixes #41 for android vorbis builds.

tanersener · Nov 9, 2018 · d46a5e1 · d46a5e1
1 parent a32f006
commit d46a5e1
Show file tree

Hide file tree

Showing 11 changed files with 12 additions and 13 deletions.
diff --git a/build/android-libvorbis.sh b/build/android-libvorbis.sh
@@ -42,7 +42,7 @@ if [[ ${RECONF_libvorbis} -eq 1 ]]; then
     autoreconf_library ${LIB_NAME}
 fi
 
-./configure \
+PKG_CONFIG= ./configure \
     --prefix=${BASEDIR}/prebuilt/android-$(get_target_build)/${LIB_NAME} \
     --with-pic \
     --with-sysroot=${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-${TOOLCHAIN}/sysroot \

diff --git a/build/ios-libvorbis.sh b/build/ios-libvorbis.sh
@@ -48,7 +48,7 @@ if [[ ${RECONF_libvorbis} -eq 1 ]]; then
     autoreconf_library ${LIB_NAME}
 fi
 
-./configure \
+PKG_CONFIG= ./configure \
     --prefix=${BASEDIR}/prebuilt/ios-$(get_target_host)/${LIB_NAME} \
     --with-pic \
     --with-sysroot=${SDK_PATH} \

diff --git a/tools/release/ios.sh b/tools/release/ios.sh
@@ -80,8 +80,7 @@ create_package "audio" "$1" || exit 1
 
 # VIDEO RELEASE
 cd ${BASEDIR}/../.. || exit 1
-./ios.sh ${CUSTOM_OPTIONS} --enable-fontconfig --enable-freetype --enable-fribidi --enable-kvazaar --enable-libaom --enable-libass --enable-libiconv --enable-libtheora --enable-libvpx
- --enable-snappy --enable-libwebp || exit 1
+./ios.sh ${CUSTOM_OPTIONS} --enable-fontconfig --enable-freetype --enable-fribidi --enable-kvazaar --enable-libaom --enable-libass --enable-libiconv --enable-libtheora --enable-libvpx --enable-snappy --enable-libwebp || exit 1
 create_package "video" "$1" || exit 1
 
 # FULL RELEASE
@@ -92,4 +91,4 @@ create_package "full" "$1" || exit 1
 # FULL-GPL RELEASE
 cd ${BASEDIR}/../.. || exit 1
 ./ios.sh ${CUSTOM_OPTIONS} --full --enable-gpl --enable-libvidstab --enable-x264 --enable-x265 --enable-xvidcore || exit 1
-create_package "full-gpl" "$1" || exit 1
+create_package "full-gpl" "$1" || exit 1
diff --git a/tools/release/ios/mobile-ffmpeg-audio.podspec b/tools/release/ios/mobile-ffmpeg-audio.podspec
@@ -14,7 +14,7 @@ Pod::Spec.new do |s|
     s.ios.frameworks    = 'Foundation', 'AudioToolbox', 'CoreImage'
     s.ios.library       = 'z', 'bz2'
 
-    s.source            = { :http => 'https://github.com/tanersener/mobile-ffmpeg/releases/download/v2.1.1/mobile-ffmpeg-audio-2.1.1-ios-framework.zip' }
+    s.source            = { :http => 'https://github.com/tanersener/mobile-ffmpeg/releases/download/v2.2/mobile-ffmpeg-audio-2.2-ios-framework.zip' }
     s.ios.vendored_frameworks = 'mobileffmpeg.framework', 'libavcodec.framework', 'libavdevice.framework', 'libavfilter.framework', 'libavformat.framework', 'libavutil.framework', 'libswresample.framework', 'libswscale.framework'
 
 end  
diff --git a/tools/release/ios/mobile-ffmpeg-full-gpl.podspec b/tools/release/ios/mobile-ffmpeg-full-gpl.podspec
@@ -14,7 +14,7 @@ Pod::Spec.new do |s|
     s.ios.frameworks    = 'Foundation', 'AudioToolbox', 'CoreImage'
     s.ios.library       = 'z', 'bz2'
 
-    s.source            = { :http => 'https://github.com/tanersener/mobile-ffmpeg/releases/download/v2.1.1/mobile-ffmpeg-full-gpl-2.1.1-ios-framework.zip' }
+    s.source            = { :http => 'https://github.com/tanersener/mobile-ffmpeg/releases/download/v2.2/mobile-ffmpeg-full-gpl-2.2-ios-framework.zip' }
     s.ios.vendored_frameworks = 'mobileffmpeg.framework', 'libavcodec.framework', 'libavdevice.framework', 'libavfilter.framework', 'libavformat.framework', 'libavutil.framework', 'libswresample.framework', 'libswscale.framework'
 
 end  
diff --git a/tools/release/ios/mobile-ffmpeg-full.podspec b/tools/release/ios/mobile-ffmpeg-full.podspec
@@ -14,7 +14,7 @@ Pod::Spec.new do |s|
     s.ios.frameworks    = 'Foundation', 'AudioToolbox', 'CoreImage'
     s.ios.library       = 'z', 'bz2'
 
-    s.source            = { :http => 'https://github.com/tanersener/mobile-ffmpeg/releases/download/v2.1.1/mobile-ffmpeg-full-2.1.1-ios-framework.zip' }
+    s.source            = { :http => 'https://github.com/tanersener/mobile-ffmpeg/releases/download/v2.2/mobile-ffmpeg-full-2.2-ios-framework.zip' }
     s.ios.vendored_frameworks = 'mobileffmpeg.framework', 'libavcodec.framework', 'libavdevice.framework', 'libavfilter.framework', 'libavformat.framework', 'libavutil.framework', 'libswresample.framework', 'libswscale.framework'
 
 end  
diff --git a/tools/release/ios/mobile-ffmpeg-https-gpl.podspec b/tools/release/ios/mobile-ffmpeg-https-gpl.podspec
@@ -13,7 +13,7 @@ Pod::Spec.new do |s|
     s.ios.deployment_target = '8.0'
     s.ios.frameworks    = 'Foundation'
 
-    s.source            = { :http => 'https://github.com/tanersener/mobile-ffmpeg/releases/download/v2.1.1/mobile-ffmpeg-https-gpl-2.1.1-ios-framework.zip' }
+    s.source            = { :http => 'https://github.com/tanersener/mobile-ffmpeg/releases/download/v2.2/mobile-ffmpeg-https-gpl-2.2-ios-framework.zip' }
     s.ios.vendored_frameworks = 'mobileffmpeg.framework', 'libavcodec.framework', 'libavdevice.framework', 'libavfilter.framework', 'libavformat.framework', 'libavutil.framework', 'libswresample.framework', 'libswscale.framework'
 
 end  
diff --git a/tools/release/ios/mobile-ffmpeg-https.podspec b/tools/release/ios/mobile-ffmpeg-https.podspec
@@ -13,7 +13,7 @@ Pod::Spec.new do |s|
     s.ios.deployment_target = '8.0'
     s.ios.frameworks    = 'Foundation'
 
-    s.source            = { :http => 'https://github.com/tanersener/mobile-ffmpeg/releases/download/v2.1.1/mobile-ffmpeg-https-2.1.1-ios-framework.zip' }
+    s.source            = { :http => 'https://github.com/tanersener/mobile-ffmpeg/releases/download/v2.2/mobile-ffmpeg-https-2.2-ios-framework.zip' }
     s.ios.vendored_frameworks = 'mobileffmpeg.framework', 'libavcodec.framework', 'libavdevice.framework', 'libavfilter.framework', 'libavformat.framework', 'libavutil.framework', 'libswresample.framework', 'libswscale.framework'
 
 end  
diff --git a/tools/release/ios/mobile-ffmpeg-min-gpl.podspec b/tools/release/ios/mobile-ffmpeg-min-gpl.podspec
@@ -13,7 +13,7 @@ Pod::Spec.new do |s|
     s.ios.deployment_target = '8.0'
     s.ios.frameworks    = 'Foundation'
 
-    s.source            = { :http => 'https://github.com/tanersener/mobile-ffmpeg/releases/download/v2.1.1/mobile-ffmpeg-min-gpl-2.1.1-ios-framework.zip' }
+    s.source            = { :http => 'https://github.com/tanersener/mobile-ffmpeg/releases/download/v2.2/mobile-ffmpeg-min-gpl-2.2-ios-framework.zip' }
     s.ios.vendored_frameworks = 'mobileffmpeg.framework', 'libavcodec.framework', 'libavdevice.framework', 'libavfilter.framework', 'libavformat.framework', 'libavutil.framework', 'libswresample.framework', 'libswscale.framework'
 
 end  
diff --git a/tools/release/ios/mobile-ffmpeg-min.podspec b/tools/release/ios/mobile-ffmpeg-min.podspec
@@ -13,7 +13,7 @@ Pod::Spec.new do |s|
     s.ios.deployment_target = '8.0'
     s.ios.frameworks    = 'Foundation'
 
-    s.source            = { :http => 'https://github.com/tanersener/mobile-ffmpeg/releases/download/v2.1.1/mobile-ffmpeg-min-2.1.1-ios-framework.zip' }
+    s.source            = { :http => 'https://github.com/tanersener/mobile-ffmpeg/releases/download/v2.2/mobile-ffmpeg-min-2.2-ios-framework.zip' }
     s.ios.vendored_frameworks = 'mobileffmpeg.framework', 'libavcodec.framework', 'libavdevice.framework', 'libavfilter.framework', 'libavformat.framework', 'libavutil.framework', 'libswresample.framework', 'libswscale.framework'
 
 end  
diff --git a/tools/release/ios/mobile-ffmpeg-video.podspec b/tools/release/ios/mobile-ffmpeg-video.podspec
@@ -14,7 +14,7 @@ Pod::Spec.new do |s|
     s.ios.frameworks    = 'Foundation', 'AudioToolbox', 'CoreImage'
     s.ios.library       = 'z', 'bz2'
 
-    s.source            = { :http => 'https://github.com/tanersener/mobile-ffmpeg/releases/download/v2.1.1/mobile-ffmpeg-video-2.1.1-ios-framework.zip' }
+    s.source            = { :http => 'https://github.com/tanersener/mobile-ffmpeg/releases/download/v2.2/mobile-ffmpeg-video-2.2-ios-framework.zip' }
     s.ios.vendored_frameworks = 'mobileffmpeg.framework', 'libavcodec.framework', 'libavdevice.framework', 'libavfilter.framework', 'libavformat.framework', 'libavutil.framework', 'libswresample.framework', 'libswscale.framework'
 
 end