updated graphics packs

2 files changed, 71 insertions, 25 deletions

diff --git a/.SRCINFO b/.SRCINFO
index fb6cd7451f7e..ece2200e55d2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,3 +1,5 @@
+# Generated by mksrcinfo v8
+# Mon Aug 29 18:32:35 UTC 2016
 pkgbase = dwarffortress-lnp-git
 	pkgdesc = Installer for the Lazy Newb Pack to run Dwarf Fortress. Includes vanilla dwarf fortress, dfhack and graphics
 	pkgver = 43.03
@@ -12,7 +14,6 @@ pkgbase = dwarffortress-lnp-git
 	makedepends = perl-libxml
 	makedepends = perl-xml-libxslt
 	makedepends = cmake
-	makedepends = gcc-multilib
 	depends = python
 	depends = gtk2
 	depends = glu
@@ -22,18 +23,6 @@ pkgbase = dwarffortress-lnp-git
 	depends = glew
 	depends = tk
 	depends = hicolor-icon-theme
-	depends = gcc-libs-multilib
-	depends = lib32-gtk2
-	depends = lib32-glu
-	depends = lib32-sdl_image
-	depends = lib32-libsndfile
-	depends = lib32-openal
-	depends = lib32-libxdamage
-	depends = lib32-ncurses
-	depends = lib32-sdl_ttf
-	depends = lib32-glew
-	depends = lib32-libjpeg6-turbo
-	depends = lib32-libpng12
 	optdepends = lib32-nvidia-utils: If you have nvidia graphics
 	optdepends = lib32-catalyst-utils: If you have ATI graphics
 	optdepends = lib32-alsa-lib: for alsa sound
@@ -44,9 +33,19 @@ pkgbase = dwarffortress-lnp-git
 	options = !strip
 	options = !buildflags
 	source = git+https://github.com/Lazy-Newb-Pack/Lazy-Newb-Pack-Linux
-	source = git+https://github.com/DFgraphics/DFgraphics.git
-	source = git+https://github.com/DFHack/dfhack.git#tag=0.43.03-r1
-	source = git+https://github.com/svenstaro/dwarf_fortress_unfuck.git#tag=0.43.03
+	source = git+https://github.com/DFgraphics/Afro-Graphics.git#tag=43.03
+	source = git+https://github.com/DFgraphics/CLA.git#tag=43.03
+	source = git+https://github.com/DFgraphics/GemSet.git#tag=43.04-v23
+	source = git+https://github.com/DFgraphics/Ironhand.git#tag=43.03
+	source = git+https://github.com/DFgraphics/Jolly-Bastion.git#tag=43.03
+	source = git+https://github.com/DFgraphics/Mayday.git#tag=43.04
+	source = git+https://github.com/DFgraphics/Obsidian.git#tag=43.03
+	source = git+https://github.com/DFgraphics/Phoebus.git#tag=43.03
+	source = git+https://github.com/DFgraphics/Spacefox.git#tag=43.03
+	source = git+https://github.com/DFgraphics/Taffer.git
+	source = git+https://github.com/DFgraphics/Tergel.git#tag=43.03
+	source = git+https://github.com/DFgraphics/Wanderlust.git#tag=43.04
+	source = git+https://github.com/DFHack/dfhack.git#tag=0.43.03-r1 git+https://github.com/svenstaro/dwarf_fortress_unfuck.git#tag=0.43.03
 	source = git+https://github.com/mifki/df-twbt.git
 	source = hg+https://bitbucket.org/Pidgeot/python-lnp
 	source = http://bay12games.com/dwarves/df_43_03_linux.tar.bz2
@@ -63,6 +62,16 @@ pkgbase = dwarffortress-lnp-git
 	md5sums = SKIP
 	md5sums = SKIP
 	md5sums = SKIP
+	md5sums = SKIP
+	md5sums = SKIP
+	md5sums = SKIP
+	md5sums = SKIP
+	md5sums = SKIP
+	md5sums = SKIP
+	md5sums = SKIP
+	md5sums = SKIP
+	md5sums = SKIP
+	md5sums = SKIP
 	md5sums = 17d9ceb486fd476b4c6e8f0834d21d2e
 	md5sums = affd6273731c321d364c55a8da314fea
 	md5sums = 35e4942313f50d35e58e9c2a51874a82
@@ -71,6 +80,19 @@ pkgbase = dwarffortress-lnp-git
 	md5sums = 389e34b6937f843c8f635d5e7326c9fc
 	md5sums = bba8ab4d3f70cea8b812e78445fef1f0
 	md5sums = 3186696644d1f33c05e3412b0c0d50f5
+	depends_x86_64 = gcc-libs-multilib
+	depends_x86_64 = lib32-gtk2
+	depends_x86_64 = lib32-glu
+	depends_x86_64 = lib32-sdl_image
+	depends_x86_64 = lib32-libsndfile
+	depends_x86_64 = lib32-openal
+	depends_x86_64 = lib32-libxdamage
+	depends_x86_64 = lib32-ncurses
+	depends_x86_64 = lib32-sdl_ttf
+	depends_x86_64 = lib32-glew
+	depends_x86_64 = lib32-libjpeg6-turbo
+	depends_x86_64 = lib32-libpng12
+	makedepends_x86_64 = gcc-multilib
 
 pkgname = dwarffortress-lnp-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 6b9d1c6c8a5f..68c40faf55e0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=dwarffortress-lnp-git
 pkgver=43.03
 _pkgver=43_03
 _dfhack_pkgrel=r1
-pkgrel=1
+pkgrel=2
 epoch=0
 pkgdesc="Installer for the Lazy Newb Pack to run Dwarf Fortress. Includes vanilla dwarf fortress, dfhack and graphics"
 arch=(x86_64)
@@ -38,13 +38,24 @@ options=(!strip !buildflags)
 install=${pkgname}.install
 changelog=
 source=(git+"https://github.com/Lazy-Newb-Pack/Lazy-Newb-Pack-Linux"
-        git+"https://github.com/DFgraphics/DFgraphics.git"
-        git+"https://github.com/DFHack/dfhack.git"#"tag=0.${pkgver}-${_dfhack_pkgrel}"
-        git+"https://github.com/svenstaro/dwarf_fortress_unfuck.git"#"tag=0.${pkgver}"
+        git+"https://github.com/DFgraphics/Afro-Graphics.git"#tag=${pkgver}
+        git+"https://github.com/DFgraphics/CLA.git"#tag=43.04-v23
+        git+"https://github.com/DFgraphics/GemSet.git"#tag=${pkgver}
+        git+"https://github.com/DFgraphics/Ironhand.git"#tag=${pkgver}
+        git+"https://github.com/DFgraphics/Jolly-Bastion.git"#tag=${pkgver}
+        git+"https://github.com/DFgraphics/Mayday.git"#tag=43.04
+        git+"https://github.com/DFgraphics/Obsidian.git"#tag=${pkgver}
+        git+"https://github.com/DFgraphics/Phoebus.git"#tag=${pkgver}
+        git+"https://github.com/DFgraphics/Spacefox.git"#tag=${pkgver}
+        git+"https://github.com/DFgraphics/Taffer.git"
+        git+"https://github.com/DFgraphics/Tergel.git"#tag=${pkgver}
+        git+"https://github.com/DFgraphics/Wanderlust.git"#tag=43.04
+        git+"https://github.com/DFHack/dfhack.git"#tag=0.${pkgver}-${_dfhack_pkgrel}
+        git+"https://github.com/svenstaro/dwarf_fortress_unfuck.git"#tag=0.${pkgver}
         git+"https://github.com/mifki/df-twbt.git"
         hg+"https://bitbucket.org/Pidgeot/python-lnp"
         "http://bay12games.com/dwarves/df_${_pkgver}_linux.tar.bz2"
-        "DFAnnouncementFilter.zip"::"http://dffd.bay12games.com/download.php?id=7905&f=DFAnnouncementFilter.zip"
+        'DFAnnouncementFilter.zip'::'http://dffd.bay12games.com/download.php?id=7905&f=DFAnnouncementFilter.zip'
         "pylnp-terminal.patch"
         "dfhack-twbt.patch"
         "dfhack-visualizers.patch"
@@ -61,6 +72,17 @@ md5sums=('SKIP'
          'SKIP'
          'SKIP'
          'SKIP'
+         'SKIP'
+         'SKIP'
+         'SKIP'
+         'SKIP'
+         'SKIP'
+         'SKIP'
+         'SKIP'
+         'SKIP'
+         'SKIP'
+         'SKIP'
+         'SKIP'
          '17d9ceb486fd476b4c6e8f0834d21d2e'
          'affd6273731c321d364c55a8da314fea'
          '35e4942313f50d35e58e9c2a51874a82'
@@ -78,10 +100,12 @@ prepare() {
   git submodule init
   git submodule update
 
-  cd $srcdir/DFgraphics
-  git submodule init
-  git submodule update
-
+  rm -rf $srcdir/DFgraphics/graphics-packs
+  mkdir -p $srcdir/DFgraphics/graphics-packs
+  for pack in Afro-Graphics CLA GemSet Ironhand Jolly-Bastion Mayday Obsidian \
+    Phoebus Spacefox Taffer Tergel Wanderlust; do
+    mv $srcdir/${pack} $srcdir/DFgraphics/graphics-packs
+  done
 
   cd $srcdir/dfhack
   git submodule init