anbox-git: Link to libcpufeatures instead of git module

Signed-off-by: Mubashshir <ahmubashshir@gmail.com>

4 files changed, 54 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e399bf278572..7e4de037e42d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = anbox-git
 	pkgdesc = Running Android in a container
 	pkgver = r1358.84f0268
-	pkgrel = 3
+	pkgrel = 4
 	epoch = 1
 	url = http://anbox.io/
 	arch = x86_64
@@ -20,15 +20,16 @@ pkgbase = anbox-git
 	depends = protobuf
 	depends = anbox-image
 	depends = libsystemd
+	depends = libcpufeatures
 	depends = boost-libs
 	depends = sdbus-cpp
 	conflicts = anbox-launchers
 	replaces = anbox-launchers
 	source = git+https://github.com/anbox/anbox.git
-	source = git+https://github.com/google/cpu_features.git
-	source = lxc.patch::https://gitlab.alpinelinux.org/alpine/aports/-/raw/fc60972afd4ff0c096498e28557b9a16e801aa7f/community/anbox/lxc4.patch
+	source = lxc4.patch::https://gitlab.alpinelinux.org/alpine/aports/-/raw/fc60972afd4ff0c096498e28557b9a16e801aa7f/community/anbox/lxc4.patch
 	source = sdbus.patch::https://gitlab.alpinelinux.org/alpine/aports/-/raw/fc60972afd4ff0c096498e28557b9a16e801aa7f/community/anbox/no-bundled-sdbus.patch
 	source = delayed-start.patch::https://gitlab.alpinelinux.org/alpine/aports/-/raw/70a1a8afb7b6ac37291d382e6e5cc7561fc88626/community/anbox/give-more-time-to-start.patch
+	source = cpu_features.patch
 	source = desktop-dir.patch
 	source = anbox-container-manager.service
 	source = anbox-session-manager.service
@@ -40,10 +41,10 @@ pkgbase = anbox-git
 	source = anbox-bridge.network
 	source = anbox-bridge.netdev
 	sha256sums = SKIP
-	sha256sums = SKIP
 	sha256sums = c1071203defdeaee56122913a6d7e67ac496c889a0c59cb889d94a58bc655bfa
 	sha256sums = 7c0626afaf1ce004ac2c57cd89db393f9a6ba21f1087001d15278a7bd79c8219
 	sha256sums = 253c211455ff0cfaa058a0b80eb41d58f84ee646c0c67dbcbcc888b5833009a7
+	sha256sums = eeeb4dd40d30d0e8c0f0001d44ca7876c1c564dfc31b24ecfb871fd133037825
 	sha256sums = d1e2e3fa1299b423f1d98cbd3c591d853f1ce8646f508ef838fe714f986fc5b2
 	sha256sums = be18c27f349560d46f7d7912b3b84d503e477fb643c55e4a7d6de9a84be93d0b
 	sha256sums = 1f22dbb5a3ca6925bbf62899cd0f0bbaa0b77c879adcdd12ff9d43adfa61b1d8
diff --git a/.gitignore b/.gitignore
index 89b686985c76..443341067c62 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,6 +7,7 @@
 !anbox.desktop
 !anbox-session-manager.service
 !desktop-dir.patch
+!cpu_features.patch
 !dev-binderfs.mount
 !.gitignore
 !org.anbox.service
diff --git a/PKGBUILD b/PKGBUILD
index 99847c3d9109..094415a79cb1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,21 +5,21 @@
 
 pkgname=anbox-git
 pkgver=r1358.84f0268
-pkgrel=3
+pkgrel=4
 epoch=1
 arch=('x86_64')
 url="http://anbox.io/"
 license=('GPL3')
 pkgdesc="Running Android in a container"
-depends=('lxc-git' 'sdl2_image' 'protobuf' 'anbox-image' 'libsystemd' 'boost-libs' 'sdbus-cpp')
+depends=('lxc-git' 'sdl2_image' 'protobuf' 'anbox-image' 'libsystemd' 'libcpufeatures' 'boost-libs' 'sdbus-cpp')
 replaces=('anbox-launchers')
 conflicts=('anbox-launchers')
 makedepends=('cmake' 'git' 'glm' 'boost' 'properties-cpp' 'gtest' 'python' 'systemd' 'dbus')
 source=("git+https://github.com/anbox/anbox.git"
-	"git+https://github.com/google/cpu_features.git"
-	'lxc.patch::https://gitlab.alpinelinux.org/alpine/aports/-/raw/fc60972afd4ff0c096498e28557b9a16e801aa7f/community/anbox/lxc4.patch'
+	'lxc4.patch::https://gitlab.alpinelinux.org/alpine/aports/-/raw/fc60972afd4ff0c096498e28557b9a16e801aa7f/community/anbox/lxc4.patch'
 	'sdbus.patch::https://gitlab.alpinelinux.org/alpine/aports/-/raw/fc60972afd4ff0c096498e28557b9a16e801aa7f/community/anbox/no-bundled-sdbus.patch'
 	'delayed-start.patch::https://gitlab.alpinelinux.org/alpine/aports/-/raw/70a1a8afb7b6ac37291d382e6e5cc7561fc88626/community/anbox/give-more-time-to-start.patch'
+	'cpu_features.patch'
 	'desktop-dir.patch'
 	'anbox-container-manager.service'
 	'anbox-session-manager.service'
@@ -31,10 +31,10 @@ source=("git+https://github.com/anbox/anbox.git"
 	'anbox-bridge.network'
 	'anbox-bridge.netdev')
 sha256sums=('SKIP'
-            'SKIP'
             'c1071203defdeaee56122913a6d7e67ac496c889a0c59cb889d94a58bc655bfa'
             '7c0626afaf1ce004ac2c57cd89db393f9a6ba21f1087001d15278a7bd79c8219'
             '253c211455ff0cfaa058a0b80eb41d58f84ee646c0c67dbcbcc888b5833009a7'
+            'eeeb4dd40d30d0e8c0f0001d44ca7876c1c564dfc31b24ecfb871fd133037825'
             'd1e2e3fa1299b423f1d98cbd3c591d853f1ce8646f508ef838fe714f986fc5b2'
             'be18c27f349560d46f7d7912b3b84d503e477fb643c55e4a7d6de9a84be93d0b'
             '1f22dbb5a3ca6925bbf62899cd0f0bbaa0b77c879adcdd12ff9d43adfa61b1d8'
@@ -60,7 +60,6 @@ prepare() {
   # Don't build tests
   truncate -s 0 cmake/FindGMock.cmake
   truncate -s 0 tests/CMakeLists.txt
-  sed -i '1i\#include <cstdint>' "$srcdir/anbox/src/anbox/input/manager.cpp"
 
   # Thanks to @bartus <arch-user-repo@bartus.33mail.com> for suggesting the patch
   # checking before applying it.
@@ -72,14 +71,10 @@ prepare() {
           warning "Patch already applied, please remove $patch.patch from source[]!"
           read -t5 -p 'press enter to continue...' || true
         else
+          msg "Applying patch: $patch"
           patch -Np1 < "$srcdir/$patch.patch"
         fi
       done
-
-  git submodule init
-  git config submodule.external/cpu_features.url $srcdir/cpu_features
-  git config --remove-section submodule.external/sdbus-cpp
-  git submodule update
 }
 
 build() {
diff --git a/cpu_features.patch b/cpu_features.patch
new file mode 100644
index 000000000000..1e8c82498237
--- /dev/null
+++ b/cpu_features.patch
@@ -0,0 +1,42 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index fc3d9bd..55e1182 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -60,6 +60,7 @@ find_package(Boost COMPONENTS filesystem log serialization system thread program
+ find_package(PkgConfig)
+ find_package(Threads)
+ find_package(SDBus-C++ REQUIRED)
++find_package(CpuFeatures REQUIRED)
+ find_package(EGL REQUIRED)
+ find_package(GLESv2 REQUIRED)
+ find_package(Protobuf REQUIRED)
+diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt
+index 332ca9e..b711e88 100644
+--- a/external/CMakeLists.txt
++++ b/external/CMakeLists.txt
+@@ -5,4 +5,3 @@ add_subdirectory(backward-cpp)
+ 
+ set(BUILD_TESTING OFF)
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-error")
+-add_subdirectory(cpu_features EXCLUDE_FROM_ALL)
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 9b7a508..64ca80d 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -25,7 +25,6 @@ include_directories(
+   ${CMAKE_BINARY_DIR}/external/android-emugl/host/libs/GLESv2_dec
+   ${CMAKE_SOURCE_DIR}/external/android-emugl/host/libs/renderControl_dec
+   ${CMAKE_BINARY_DIR}/external/android-emugl/host/libs/renderControl_dec
+-  ${CMAKE_SOURCE_DIR}/external/cpu_features/include
+ )
+ 
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DBINDERFS_PATH=\"\\\"${BINDERFS_PATH}\\\"\"")
+@@ -399,7 +398,7 @@ target_link_libraries(anbox-core
+   ${MIRCLIENT_LIBRARIES}
+   ${LIBSYSTEMD_LDFLAGS}
+   ${LIBSYSTEMD_LIBRARIES}
+-  cpu_features
++  CpuFeatures::cpu_features
+   pthread
+   process-cpp
+   emugl_common