Build improvements

Author: emericg

MiniVideoInfos.pro

@@ -8,7 +8,7 @@ CONFIG += c++17
 QT     += core qml quickcontrols2 svg widgets charts location
 
 # Bundle name
-QMAKE_TARGET_BUNDLE_PREFIX = com.minivideo
+QMAKE_TARGET_BUNDLE_PREFIX = io.minivideo
 QMAKE_BUNDLE = infos
 
 # Validate Qt version
@@ -17,7 +17,7 @@ QMAKE_BUNDLE = infos
 # Project features #############################################################
 
 DEFINES += ENABLE_MINIVIDEO
-#DEFINES += ENABLE_TAGLIB
+DEFINES += ENABLE_TAGLIB
 DEFINES += ENABLE_LIBEXIF
 #DEFINES += ENABLE_EXIV2
 

assets/android/build.gradle

@@ -83,7 +83,7 @@ android {
     defaultConfig {
         resConfig "en"
         minSdkVersion 23 // qtMinSdkVersion
-        targetSdkVersion 34 // qtTargetSdkVersion
+        targetSdkVersion 35 // qtTargetSdkVersion
         ndk.abiFilters = qtTargetAbiList.split(",")
 
         namespace 'com.minivideo.infos'

assets/android/gradle.properties

@@ -21,7 +21,7 @@ android.useAndroidX=true
 
 androidCompileSdkVersion=34
 androidBuildToolsVersion=34.0.0
-androidNdkVersion=26.1.10909125
+androidNdkVersion=26.3.11579264
 
 qtMinSdkVersion=23
-qtTargetSdkVersion=34
+qtTargetSdkVersion=35

assets/android/res/values/apptheme.xml

@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
   <style name="AppTheme">
-    <item name="android:windowBackground">@android:color/white</item>
+    <item name="android:windowFullscreen">true</item>
+    <item name="android:windowBackground">@drawable/splash</item>
     <item name="android:statusBarColor">@android:color/white</item>
     <item name="android:navigationBarColor">@android:color/white</item>
   </style>

contribs/contribs_builder.py

@@ -35,7 +35,7 @@
 print("")
 
 targets = ['linux', 'macos', 'macos_x86_64', 'macos_arm64', 'msvc2019', 'msvc2022',
-           'android_armv8', 'android_armv7', 'android_x86_64', 'android_x86'
+           'android_armv8', 'android_armv7', 'android_x86_64', 'android_x86',
            'ios', 'ios_simulator', 'ios_armv7', 'ios_armv8']
 
 softwares = ['libexif', 'taglib', 'minivideo']
@@ -286,6 +286,7 @@ def copytree_wildcard(src, dst, symlinks=False, ignore=None):
 FILE_taglib_utfcpp = "utfcpp-v4.0.5.zip"
 FILE_taglib = "taglib-master.zip"
 DIR_taglib = "taglib-master"
+DIR_taglib_utfcpp = DIR_taglib + "/3rdparty/utfcpp"
 
 if "taglib" in softwares_selected:
     if not os.path.exists(src_dir + FILE_taglib):
@@ -295,7 +296,7 @@ def copytree_wildcard(src, dst, symlinks=False, ignore=None):
         print("> Downloading " + FILE_taglib_utfcpp + "...")
         urllib.request.urlretrieve("https://github.com/nemtrif/utfcpp/archive/refs/tags/v4.0.5.zip", src_dir + FILE_taglib_utfcpp)
 
-## minivideo (version: git) (0.14+)
+## minivideo (version: git) (0.15+)
 FILE_minivideo = "minivideo-master.zip"
 DIR_minivideo = "MiniVideo-master"
 
@@ -419,13 +420,19 @@ def copytree_wildcard(src, dst, symlinks=False, ignore=None):
             zipTL.extractall(build_dir)
             os.rmdir(build_dir + DIR_taglib + "/3rdparty/utfcpp/")
             os.makedirs(build_dir + DIR_taglib + "/build")
-        if not os.path.isdir(build_dir + DIR_taglib + "/3rdparty/utfcpp/"):
+        if not os.path.isdir(build_dir + DIR_taglib_utfcpp):
             zipUTFCPP = zipfile.ZipFile(src_dir + FILE_taglib_utfcpp)
             zipUTFCPP.extractall(build_dir+ DIR_taglib + "/3rdparty/")
-            os.rename(build_dir + DIR_taglib + "/3rdparty/utfcpp-4.0.5/", build_dir + DIR_taglib + "/3rdparty/utfcpp/")
+            os.rename(build_dir + DIR_taglib + "/3rdparty/utfcpp-4.0.5/", build_dir + DIR_taglib_utfcpp)
+            os.makedirs(build_dir + DIR_taglib_utfcpp + "/build")
+
+        print("> Building utfcpp")
+        subprocess.check_call(CMAKE_cmd + ["-G", CMAKE_gen, "-DCMAKE_BUILD_TYPE=Release", "-DBUILD_SHARED_LIBS:BOOL=" + build_shared, "-DBUILD_STATIC_LIBS:BOOL=" + build_static, "-DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=TRUE", "-DCMAKE_INSTALL_PREFIX=" + env_dir + "/usr", ".."], cwd=build_dir + DIR_taglib_utfcpp + "/build")
+        subprocess.check_call(["cmake", "--build", ".", "--config", "Release"], cwd=build_dir + DIR_taglib_utfcpp + "/build")
+        subprocess.check_call(["cmake", "--build", ".", "--target", "install", "--config", "Release"], cwd=build_dir + DIR_taglib_utfcpp + "/build")
 
         print("> Building taglib")
-        subprocess.check_call(CMAKE_cmd + ["-G", CMAKE_gen, "-DCMAKE_BUILD_TYPE=Release", "-DBUILD_SHARED_LIBS:BOOL=" + build_shared, "-DBUILD_STATIC_LIBS:BOOL=" + build_static, "-DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=TRUE", "-DCMAKE_PREFIX_PATH=" + build_dir + DIR_taglib + "/3rdparty/utfcpp/source/", "-DCMAKE_INSTALL_PREFIX=" + env_dir + "/usr", ".."], cwd=build_dir + DIR_taglib + "/build")
+        subprocess.check_call(CMAKE_cmd + ["-G", CMAKE_gen, "-DCMAKE_BUILD_TYPE=Release", "-DBUILD_SHARED_LIBS:BOOL=" + build_shared, "-DBUILD_STATIC_LIBS:BOOL=" + build_static, "-DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=TRUE", "-Dutf8cpp_INCLUDE_DIR=" + env_dir + "/usr/include/utf8cpp", "-DCMAKE_INSTALL_PREFIX=" + env_dir + "/usr", ".."], cwd=build_dir + DIR_taglib + "/build")
         subprocess.check_call(["cmake", "--build", ".", "--config", "Release"], cwd=build_dir + DIR_taglib + "/build")
         subprocess.check_call(["cmake", "--build", ".", "--target", "install", "--config", "Release"], cwd=build_dir + DIR_taglib + "/build")