Fix dependencies

2 files changed, 18 insertions, 16 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 09d3e7b7a723..847676b3d549 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,12 +1,11 @@
-pkgbase = aosp-devel
+pkgbase = android-devel
 	pkgdesc = Metapackage to pull all dependencies required to build modern Android
-	pkgver = 0.9
+	pkgver = 1.0
 	pkgrel = 1
 	url = https://wiki.archlinux.org/title/Android#Building
 	arch = x86_64
 	license = None
-	depends = gcc-multilib
-	depends = repo
+	depends = gcc
 	depends = git
 	depends = gnupg
 	depends = flex
@@ -25,16 +24,19 @@ pkgbase = aosp-devel
 	depends = bc
 	depends = rsync
 	depends = ccache
-	depends = vim
-	depends = java-environment
 	depends = inetutils
 	depends = ncurses5-compat-libs
 	depends = lib32-zlib
 	depends = lib32-ncurses
 	depends = lib32-readline
-	depends = lib32-ncurses5-compat-libs
 	depends = libxcrypt-compat
+	depends = ffmpeg
+	depends = ninja
+	depends = xml2
+	depends = lzop
+	depends = pngcrush
+	depends = imagemagick
 	optdepends = wxgtk2: may be required on older versions
 	optdepends = python2-virtualenv: required on older versions to make python2 the default
 
-pkgname = aosp-devel
+pkgname = android-devel
diff --git a/PKGBUILD b/PKGBUILD
index 3176f0289ea4..7a0feb049865 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,18 +1,18 @@
 # Maintainer: Tim Schumacher
 # Contributor: Pablo Moyano (p4block)
-pkgname=aosp-devel
-pkgver=0.9
+pkgname=android-devel
+pkgver=1.0
 pkgrel=1
 pkgdesc='Metapackage to pull all dependencies required to build modern Android'
 arch=('x86_64')
 url='https://wiki.archlinux.org/title/Android#Building'
 license=('None')
-depends=('gcc-multilib' 'repo' 'git' 'gnupg' 'flex' 'bison' 'gperf' 'sdl'
+depends=('gcc' 'git' 'gnupg' 'flex' 'bison' 'gperf' 'sdl'
          'squashfs-tools' 'curl' 'ncurses' 'zlib' 'schedtool' 'perl-switch'
-         'zip' 'unzip' 'libxslt' 'bc' 'rsync' 'ccache' 'vim'
-	 'java-environment' 'inetutils'
-         'ncurses5-compat-libs' 'lib32-zlib' 'lib32-ncurses' 'lib32-readline'
-         'lib32-ncurses5-compat-libs' 'libxcrypt-compat')
+         'zip' 'unzip' 'libxslt' 'bc' 'rsync' 'ccache' 'inetutils'
+         'ncurses5-compat-libs' 'lib32-zlib' 'lib32-ncurses' 'lib32-readline' 'libxcrypt-compat'
+
+         #LineageOS Devel
+         'ffmpeg' 'ninja' 'xml2' 'lzop' 'pngcrush' 'imagemagick')
 optdepends=('wxgtk2: may be required on older versions'
             'python2-virtualenv: required on older versions to make python2 the default')
-