Update to 3.4.0

2 files changed, 45 insertions, 42 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6796daed3198..fe5978369c2b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = mingw-w64-mygui
-	pkgdesc = A multilayer and overlappable GUI System for OGRE (mingw-w64)
-	pkgver = 3.2.2
+	pkgdesc = A multilayer and overlappable GUI System (mingw-w64)
+	pkgver = 3.4.0
 	pkgrel = 1
 	url = http://mygui.info/
 	arch = any
@@ -13,22 +13,14 @@ pkgbase = mingw-w64-mygui
 	makedepends = ttf-dejavu
 	depends = mingw-w64-crt
 	depends = mingw-w64-boost
-	depends = mingw-w64-ogre
-	depends = mingw-w64-ois
+	depends = mingw-w64-sdl2
+	depends = mingw-w64-sdl2_image
 	depends = mingw-w64-pkg-config
 	options = !strip
 	options = !buildflags
 	options = staticlibs
-	source = https://github.com/MyGUI/mygui/archive/MyGUI3.2.2.tar.gz
-	source = findogre.patch
-	source = platforms.patch
-	source = cmakeinstall.patch
-	source = cmake-boost-system.patch
-	md5sums = 0023a689a2a63febc2cc703f81f86c62
-	md5sums = bb4b844665e339fe1f5e596b8997d162
-	md5sums = d0fb901ad31fb43357d88ce091999652
-	md5sums = 03369fc85c24a92af9a24b6e530fac40
-	md5sums = 69c53e5e0b57a9537092dbaf0a0d03c2
+	source = https://github.com/MyGUI/mygui/archive/MyGUI3.4.0.tar.gz
+	sha512sums = 3f560fd9c7e5b514da40e41c7753dc20649f80b763f5ee20afc9627df3be14242ea833eff09eac16b9e88b1c9fbed7c09def0c5068c832e710c247191fb53487
 
 pkgname = mingw-w64-mygui
 
diff --git a/PKGBUILD b/PKGBUILD
index a85ae1989702..6a79a1680e45 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,47 +1,53 @@
 # Maintainer: Karl-Felix Glatzer <karl.glatzer@gmx.de>
 pkgbase=mingw-w64-mygui
 pkgname=('mingw-w64-mygui')
-pkgver=3.2.2
+pkgver=3.4.0
 pkgrel=1
-pkgdesc="A multilayer and overlappable GUI System for OGRE (mingw-w64)"
+pkgdesc="A multilayer and overlappable GUI System (mingw-w64)"
 arch=('any')
 url="http://mygui.info/"
 license=('LGPL')
-depends=('mingw-w64-crt' 'mingw-w64-boost' 'mingw-w64-ogre' 'mingw-w64-ois' 'mingw-w64-pkg-config')
+depends=('mingw-w64-crt' 'mingw-w64-boost' 'mingw-w64-sdl2' 'mingw-w64-sdl2_image' 'mingw-w64-pkg-config')
 options=(!strip !buildflags staticlibs)
 makedepends=('mingw-w64-cmake' 'mingw-w64-gcc' 'mingw-w64-pkg-config' 'doxygen' 'graphviz' 'ttf-dejavu')
-source=("https://github.com/MyGUI/mygui/archive/MyGUI$pkgver.tar.gz"
-        'findogre.patch'
-        'platforms.patch'
-        'cmakeinstall.patch'
-        'cmake-boost-system.patch')
-md5sums=('0023a689a2a63febc2cc703f81f86c62'
-         'bb4b844665e339fe1f5e596b8997d162'
-         'd0fb901ad31fb43357d88ce091999652'
-         '03369fc85c24a92af9a24b6e530fac40'
-         '69c53e5e0b57a9537092dbaf0a0d03c2')
+source=("https://github.com/MyGUI/mygui/archive/MyGUI${pkgver}.tar.gz")
+sha512sums=('3f560fd9c7e5b514da40e41c7753dc20649f80b763f5ee20afc9627df3be14242ea833eff09eac16b9e88b1c9fbed7c09def0c5068c832e710c247191fb53487')
 _architectures="i686-w64-mingw32 x86_64-w64-mingw32"
 
-prepare() {
-  cd $srcdir/mygui-MyGUI$pkgver
-
-  patch -Np1 < ../findogre.patch
-  patch -Np1 < ../platforms.patch
-  patch -Np1 < ../cmakeinstall.patch
-  patch -Np1 < ../cmake-boost-system.patch
-}
-
 build() {
   for _arch in ${_architectures}; do
+    # Static build
+    mkdir -p ${srcdir}/build-${_arch}-static && cd ${srcdir}/build-${_arch}-static
+
+    unset LDFLAGS CXXFLAGS
+    ${_arch}-cmake .. \
+      -DCMAKE_INSTALL_PREFIX=/usr/${_arch} \
+      -DMYGUI_INSTALL_SAMPLES=FALSE \
+      -DMYGUI_INSTALL_TOOLS=FALSE \
+      -DMYGUI_INSTALL_DOCS=FALSE \
+      -DMYGUI_INSTALL_MEDIA=FALSE \
+      -DCMAKE_BUILD_TYPE=Release \
+      -DMYGUI_BUILD_DEMOS=FALSE \
+      -DMYGUI_BUILD_TOOLS=FALSE \
+      -DMYGUI_STATIC=TRUE \
+      -DMYGUI_RENDERSYSTEM=7 \
+      ../mygui-MyGUI$pkgver
+    make
+
+    # Shared build
     mkdir -p ${srcdir}/build-${_arch} && cd ${srcdir}/build-${_arch}
 
     unset LDFLAGS CXXFLAGS
     ${_arch}-cmake .. \
       -DCMAKE_INSTALL_PREFIX=/usr/${_arch} \
-      -DCMAKE_BUILD_TYPE="release" \
-      -DMYGUI_SAMPLES_INPUT=2 \
-      -DMYGUI_BUILD_DEMOS="False" \
-      -DMYGUI_BUILD_TOOLS="False" \
+      -DMYGUI_INSTALL_SAMPLES=FALSE \
+      -DMYGUI_INSTALL_TOOLS=FALSE \
+      -DMYGUI_INSTALL_DOCS=FALSE \
+      -DMYGUI_INSTALL_MEDIA=FALSE \
+      -DCMAKE_BUILD_TYPE=Release \
+      -DMYGUI_BUILD_DEMOS=FALSE \
+      -DMYGUI_BUILD_TOOLS=FALSE \
+      -DMYGUI_RENDERSYSTEM=7 \
       ../mygui-MyGUI$pkgver
     make
   done
@@ -49,11 +55,16 @@ build() {
 
 package() {
   for _arch in ${_architectures}; do
+    # Install static binaries
+    cd ${srcdir}/build-${_arch}-static
+    make DESTDIR=${pkgdir} install
+
+    # Install shared binaries
     cd ${srcdir}/build-${_arch}
     make DESTDIR=${pkgdir} install
 
-    ${_arch}-strip -x -g ${pkgdir}/usr/${_arch}/bin/release/*.dll
-    ${_arch}-strip -g ${pkgdir}/usr/${_arch}/lib/release/*.a
+    ${_arch}-strip -x -g ${pkgdir}/usr/${_arch}/bin/Release/*.dll
+    ${_arch}-strip -g ${pkgdir}/usr/${_arch}/lib/Release/*.a
   done
 }