clibgen 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f26c78242f90a0cb7dcf1b9bbc8f58950c7988a75d344c565a28146b2a49ab1b
-  data.tar.gz: a98e3aef8e944dafe1d405f5bef280d6804900d529e63cc77f6a6e25b2ae2526
+  metadata.gz: 12cc7a23cdc26805500a59bce5d8c199a298712730731be16f3e1a6051d3d1af
+  data.tar.gz: c63c426c9212952fbed5b513368093054b98cbaaee1a8ae9acc18d6311714caf
 SHA512:
-  metadata.gz: 458bf8d50132b6ebb6431fb3901dc88690a82aff06cfe9d324e8e2946c1d5af7a1814f1dddafc6903599266485bb01e0be94c657fab5110ea69017bf66816d07
-  data.tar.gz: b09d2def25700cff722ec6870b7a6f242ffe8eedbaa02a67992ef7e2c1e3662ea0beb5e3baa952308dcb40db8f043a69bf642b7f9966ec773d46731b17b77114
+  metadata.gz: fb049118649a4c02ebd3c5dd5a7ee3d0a8d38706bdac202dca97f7ef82e16942478d8851b2a2015717bf8a924508d31a8d89cad3e367c2a081946736c93a0591
+  data.tar.gz: 35a03fa67e0b84d3ad67866cdd04bb9d368faa29335e7a09ba1769fab3006debd849bc0a89f635fe1d964975b65bf7dcee40427a705e3c95ea32ac372084cd6c

data/lib/asset/libde265.sh

@@ -3,17 +3,18 @@ ndk_path=$2
 asset_path=$3
 tmp_path=$root_path/tmp
 to_ndk_path=$tmp_path/android-ndk
+toolchain_path=$tmp_path/ndk
 
-if [ ! -e $tmp_path ] 
+if [ ! -e $tmp_path ]
 then
-	mkdir $tmp_path
+    mkdir $tmp_path
 fi
 cp -r -n $ndk_path $tmp_path
 
 if [ ! -e $tmp_path/ndk ]
-then 
-	cd $to_ndk_path/build/tools
-	./make_standalone_toolchain.py --arch arm --api 21 --stl libc++ --install-dir $tmp_path/ndk
+then
+    cd $to_ndk_path/build/tools
+    ./make_standalone_toolchain.py --arch arm --api 21 --stl libc++ --install-dir $toolchain_path
 fi
 
 echo "---------build libde265---------"
@@ -27,11 +28,12 @@ fi
 out_dir=$root_path/out/libde265
 
 cd libde265
-export CC=$tmp_path/ndk/bin/clang 
-export CXX=$tmp_path/ndk/bin/clang++
-export CFLAGS="-fPIE"
-export LDFLAGS="-fPIE"
-export PATH=$PATH:$tmp_path/ndk/bin
+export CC=$toolchain_path/bin/arm-linux-androideabi-clang
+export CXX=$toolchain_path/bin/arm-linux-androideabi-clang++
+export CFLAGS="-fPIC"
+export CXXFLAGS="-fPIC"
+export LDFLAGS="-fPIC"
+export PATH=$PATH:$toolchain_path/bin
 sh ./autogen.sh
 ./configure --prefix=$out_dir --enable-shared=no --host=arm-linux-androideabi --disable-arm --disable-sse --disable-sherlock265 
 make -j8 && make install

data/lib/asset/libheif.sh

@@ -3,17 +3,18 @@ ndk_path=$2
 asset_path=$3
 tmp_path=$root_path/tmp
 to_ndk_path=$tmp_path/android-ndk
+toolchain_path=$tmp_path/ndk
 
-if [ ! -e $tmp_path ] 
+if [ ! -e $tmp_path ]
 then
-	mkdir $tmp_path
+    mkdir $tmp_path
 fi
 cp -r -n $ndk_path $tmp_path
 
 if [ ! -e $tmp_path/ndk ]
-then 
-	cd $to_ndk_path/build/tools
-	./make_standalone_toolchain.py --arch arm --api 21 --stl libc++ --install-dir $tmp_path/ndk
+then
+    cd $to_ndk_path/build/tools
+    ./make_standalone_toolchain.py --arch arm --api 21 --stl libc++ --install-dir $toolchain_path
 fi
 
 echo "---------build libheif---------"
@@ -27,8 +28,8 @@ fi
 cd libheif
 sh ./autogen.sh
 
-export CC=$tmp_path/ndk/bin/arm-linux-androideabi-clang
-export CXX=$tmp_path/ndk/bin/arm-linux-androideabi-clang++
+export CC=$toolchain_path/bin/arm-linux-androideabi-clang
+export CXX=$toolchain_path/bin/arm-linux-androideabi-clang++
 export CFLAGS="-fPIE -Wno-tautological-constant-compare"
 export CXXFLAGS="-fPIE -Wno-tautological-constant-compare"
 export LDFLAGS="-fPIE -pie" 
@@ -36,4 +37,5 @@ export PKG_CONFIG_PATH=$root_path/out/x265/lib/pkgconfig:$root_path/out/libde265
 export PATH=$PATH:$tmp_path/ndk/bin
 
 out_dir=$root_path/out/libheif
-./configure --prefix=$out_dir --host=arm-linux-androideabi
+./configure --prefix=$out_dir --host=arm-linux-androideabi --disable-go 
+make -j8 && make install

data/lib/asset/libpng.sh

@@ -2,13 +2,22 @@ root_path=$1
 ndk_path=$2
 asset_path=$3
 tmp_path=$root_path/tmp
+to_ndk_path=$tmp_path/android-ndk
+toolchain_path=$tmp_path/ndk
 
-if [ ! -e $tmp_path ] 
+if [ ! -e $tmp_path ]
 then
-	mkdir -p $tmp_path
+    mkdir $tmp_path
 fi
+cp -r -n $ndk_path $tmp_path
 
-export PATH=${PATH}:$ndk_path
+if [ ! -e $tmp_path/ndk ]
+then
+    cd $to_ndk_path/build/tools
+    ./make_standalone_toolchain.py --arch arm --api 21 --stl libc++ --install-dir $toolchain_path
+fi
+
+echo "---------build libpng---------"
 
 cd $tmp_path
 if [ ! -e ./libpng ]
@@ -16,61 +25,12 @@ then
 	git clone https://github.com/glennrp/libpng.git -q
 fi
 
-if [ ! -e ./libpng-android ]
-then 
-	git clone https://github.com/julienr/libpng-android.git -q
-fi
-
-if [ ! -e ./zlib ]
-then 
-	git clone https://github.com/madler/zlib.git -q
-fi
-
-cd $tmp_path/libpng-android/jni
-
-
+out_dir=$root_path/out/libpng
 cd $tmp_path/libpng
 
-for filename in * ; 
-do 
-	if [[ $filename = *.h ]] || [[ $filename = *.c ]] || [[ $filename = "arm" ]];
-	then 
-		if [ -d ./$filename ] 
-		then 
-			cp -f -r $tmp_path/libpng/$filename $tmp_path/libpng-android/jni/ 
-		else 
-			cp -f $tmp_path/libpng/$filename $tmp_path/libpng-android/jni/$filename 
-		fi
-
-	fi
-done
-
-cd $tmp_path/zlib
-
-for filename in * ; 
-do 
-	if [[ $filename = *.h ]] || [[ $filename = *.c ]];
-	then 
-		cp -f $tmp_path/zlib/$filename $tmp_path/libpng-android/jni/$filename 
-	fi
-done
-
-cd $tmp_path/libpng-android/jni
-
-android_content=`cat Application.mk`
-if [[ ! $android_content == *"APP_PLATFORM"* ]] 
-then 
-	echo 'APP_PLATFORM := android-16' >> Application.mk
-fi
-cp -r $asset_path/Android.mk $tmp_path/libpng-android/jni/Android.mk
-
-
-cd $tmp_path/libpng-android
-./build.sh
-
-out_dir=$root_path/out/libpng
-if [ ! -e $out_dir ] 
-then
-	mkdir -p $out_dir 
-fi
-cp -f -r $tmp_path/libpng-android/obj $out_dir
+export CC=$toolchain_path/bin/arm-linux-androideabi-clang
+export CFLAGS='-fPIE -fno-integrated-as' 
+export LDFLAGS='-fPIE -pie' 
+export PATH=$PATH:$toolchain_path/bin
+./configure --prefix=$out_dir --host=arm-linux-androideabi --enable-shared=no --enable-arm-neon
+make -j8 && make install

data/lib/asset/x265.sh

@@ -0,0 +1,49 @@
+root_path=$1
+ndk_path=$2
+asset_path=$3
+tmp_path=$root_path/tmp
+to_ndk_path=$tmp_path/android-ndk
+toolchain_path=$tmp_path/ndk
+
+if [ ! -e $tmp_path ]
+then
+    mkdir $tmp_path
+fi
+cp -r -n $ndk_path $tmp_path
+
+if [ ! -e $tmp_path/ndk ]
+then
+    cd $to_ndk_path/build/tools
+    ./make_standalone_toolchain.py --arch arm --api 21 --stl libc++ --install-dir $toolchain_path
+fi
+
+echo "---------build x265-----------"
+cd $tmp_path
+if [ ! -e ./x265 ]
+then 
+    git clone https://github.com/videolan/x265 -q
+fi
+
+cd $tmp_path/x265/source/common/
+cpu_content=`cat cpu.cpp`
+replace_str1="void PFX(cpu_neon_test)(void) {}"
+replace_str2="int PFX(cpu_fast_neon_mrc_test)(void) { return 0; }"
+if [[ "$cpu_content" != *$replace_str1* ]]
+then 
+    sed -i '' 's/void PFX(cpu_neon_test)(void);/void PFX(cpu_neon_test)(void) {}/g' "cpu.cpp"
+fi
+if [[ "$cpu_content" != *$replace_str2* ]]
+then
+    sed -i '' 's/int PFX(cpu_fast_neon_mrc_test)(void);/int PFX(cpu_fast_neon_mrc_test)(void) { return 0; }/g' 'cpu.cpp'
+fi
+
+out_dir=$root_path/out/x265
+
+cd $tmp_path/x265/build
+mkdir -p arm-android && cd arm-android
+cmake -DCROSS_COMPILE_ARM=1 -DCMAKE_SYSTEM_NAME=Linux -DCMAKE_SYSTEM_PROCESSOR=armv7l \
+        -DCMAKE_C_COMPILER=$toolchain_path/bin/arm-linux-androideabi-clang -DCMAKE_CXX_COMPILER=$toolchain_path/bin/arm-linux-androideabi-clang++ \
+        -DCMAKE_FIND_ROOT_PATH=$toolchain_path/sysroot -DENABLE_ASSEMBLY=OFF -DENABLE_CLI=OFF \
+        -DENABLE_PIC=ON -DENABLE_SHARED=OFF -DCMAKE_INSTALL_PREFIX=$out_dir -DCMAKE_C_FLAGS="" \
+        -G "Unix Makefiles" ../../source
+make -j8 && make install

data/lib/libgen/gen.rb

@@ -9,7 +9,7 @@ module Gen
     end
 
     def self.tmp_dir
-        "/tmp/libgen"  
+        "/tmp/com.app.libgen.747528f1"  
     end
 
     def self.asset_path 
@@ -23,7 +23,7 @@ module Gen
     def self.run
         options = {}
         OptionParser.new do |opts|
-            opts.banner = "Usage: 编译C/C++库为提供安卓/ios所用"
+            opts.banner = "Usage: 编译C/C++库为提供安卓/ios所用， 请自行下载NDK工具包"
 
             opts.on("-o", "--out folder", "输入目录") do |v|
                 options[:out] = v
@@ -33,10 +33,9 @@ module Gen
                 options[:ndk] = v 
             end
 
-            opts.on("-l", "--lib lib",Array,"库名称，例如：libpng、x256、libde265、libheif ...") do |v|
+            opts.on("-l", "--lib lib",Array,"库名称，例如：libpng、x265、libde265、libheif ...") do |v|
                 options[:lib] = v 
             end
-
         end.parse!
 
         out_dir = options[:out] 
@@ -45,8 +44,8 @@ module Gen
 
         if file_exist? tmp_dir 
             `rm -rf #{tmp_dir}`
-            `mkdir #{tmp_dir}`
         end
+        `mkdir -p #{tmp_dir}`
 
         if !(file_exist?(out_dir) && file_exist?(ndk_dir)) 
             puts "指定的目录不存在".colorize(:red)
@@ -54,16 +53,25 @@ module Gen
         end
 
         lib_type.each do |lib| 
+            if lib == "libheif" 
+                ["x265", "libde265" , "libpng"].each do |dlib|
+                    buildlib out_dir, ndk_dir, dlib 
+                end
+            end
             buildlib out_dir, ndk_dir, lib 
         end
 
         if lib_type.length == 0  
-            puts "请指定 -t，可选为 [libpng、x256、libde265、libheif]"
+            puts "请指定 -t，可选为 [libpng、x265、libde265、libheif]"
         end
 
         `cp -r -f "#{tmp_dir}/out" "#{out_dir}"`
         puts "任务完成，请查看目标目录".colorize(:green)
         `open #{out_dir}`
+
+        if file_exist? tmp_dir 
+            `rm -rf #{tmp_dir}`
+        end
     end
 
     def self.buildlib(out_dir, ndk_dir, lib) 

data/lib/libgen/version.rb

@@ -1,3 +1,3 @@
 module Libgen
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: clibgen
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - kaich
@@ -84,11 +84,10 @@ files:
 - Rakefile
 - bin/.DS_Store
 - bin/clibgen
-- lib/asset/Android.mk
 - lib/asset/libde265.sh
 - lib/asset/libheif.sh
 - lib/asset/libpng.sh
-- lib/asset/x256.sh
+- lib/asset/x265.sh
 - lib/libgen.rb
 - lib/libgen/gen.rb
 - lib/libgen/version.rb

data/lib/asset/Android.mk

@@ -1,49 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_CFLAGS :=
-
-LOCAL_MODULE    := libpng
-LOCAL_SRC_FILES :=\
-	adler32.c \
-	compress.c \
-	crc32.c \
-	deflate.c \
-	example.c \
-	gzclose.c \
-	gzlib.c \
-	gzread.c \
-	gzwrite.c \
-	infback.c \
-	inffast.c \
-	inflate.c \
-	inftrees.c \
-	png.c \
-	pngerror.c \
-	pngget.c \
-	pngmem.c \
-	pngpread.c \
-	pngread.c \
-	pngrio.c \
-	pngrtran.c \
-	pngrutil.c \
-	pngset.c \
-	pngtest.c \
-	pngtrans.c \
-	pngwio.c \
-	pngwrite.c \
-	pngwtran.c \
-	pngwutil.c \
-	trees.c \
-	uncompr.c \
-	zutil.c  \
-	arm/filter_neon_intrinsics.c \
-	arm/palette_neon_intrinsics.c \
-	arm/arm_init.c
-
-#LOCAL_SHARED_LIBRARIES := -lz
-LOCAL_EXPORT_LDLIBS := -lz
-LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/.
-
-# include $(BUILD_SHARED_LIBRARY)
-include $(BUILD_STATIC_LIBRARY)

data/lib/asset/x256.sh

@@ -1,32 +0,0 @@
-root_path=$1
-ndk_path=$2
-asset_path=$3
-tmp_path=$root_path/tmp
-to_ndk_path=$tmp_path/android-ndk
-
-if [ ! -e $tmp_path ] 
-then
-	mkdir $tmp_path
-fi
-cp -r -n $ndk_path $tmp_path
-
-if [ ! -e $tmp_path/ndk ]
-then 
-	cd $to_ndk_path/build/tools
-	./make_standalone_toolchain.py --arch arm --api 21 --stl libc++ --install-dir $tmp_path/ndk
-fi
-
-echo "---------build x265-----------"
-cd $tmp_path
-git clone https://github.com/videolan/x265 -q
-
-out_dir=$root_path/out/x256
-
-cd $tmp_path/x265/build
-mkdir -p arm-android && cd arm-android
-cmake -DCROSS_COMPILE_ARM=1 -DCMAKE_SYSTEM_NAME=Linux -DCMAKE_SYSTEM_PROCESSOR=armv7l \
-        -DCMAKE_C_COMPILER=/tmp/ndk/bin/arm-linux-androideabi-clang -DCMAKE_CXX_COMPILER=/tmp/ndk/bin/arm-linux-androideabi-clang++ \
-        -DCMAKE_FIND_ROOT_PATH=/tmp/ndk/sysroot -DENABLE_ASSEMBLY=OFF -DENABLE_CLI=OFF \
-        -DENABLE_PIC=ON -DENABLE_SHARED=OFF -DCMAKE_INSTALL_PREFIX=$out_dir -DCMAKE_C_FLAGS="" \
-        -G "Unix Makefiles" ../../source
-make -j8 && make install