openclonk: Update to 7.0.

Requires a few patches which have already been added to upstream,
we need to remember to remove them when upstream provides a new
release.

diff --git a/openclonk/Makefile b/openclonk/Makefile
index d6414d3bfa59a420613d3909530f2852bfa3cd0a..1c1c824a1fc256475987d812cd828e2f21c654b9 100644 (file)
--- a/openclonk/Makefile
+++ b/openclonk/Makefile
@@ -2,7 +2,7 @@
 
 PKGNAME=       openclonk-${VERSION}
 DISTNAME=      openclonk-${PKGVERSION_NOREV}-src
-VERSION=       6.1
+VERSION=       7.0
 CATEGORIES=    games
 MASTER_SITES=  http://www.openclonk.org/builds/release/${VERSION}/
 EXTRACT_SUFX=  .tar.bz2
@@ -15,18 +15,16 @@ LICENSE=    isc
 USE_CMAKE=     yes
 USE_LANGUAGES= c c++
 USE_TOOLS+=    pkg-config
+GCC_REQD=      4.9
 
-# XXX This shouldn't be necessary...
-CFLAGS+= -fpermissive
-
+.include "../../devel/readline/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/jpeg/buildlink3.mk"
 .include "../../graphics/glew/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
+.include "../../x11/gtk3/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../audio/libvorbis/buildlink3.mk"
 .include "../../multimedia/libogg/buildlink3.mk"
 .include "../../audio/SDL_mixer/buildlink3.mk"
-.include "../../x11/gtksourceview2/buildlink3.mk"
-.include "../../audio/openal/buildlink3.mk"
+.include "../../x11/gtksourceview3/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

diff --git a/openclonk/PLIST b/openclonk/PLIST
index 1677d7c1cad7bb2610fddce166c3a84e1b4105b3..86b3b2743cab6d5b6f2bbc497be3a4dc85884c4f 100644 (file)
--- a/openclonk/PLIST
+++ b/openclonk/PLIST
@@ -4,6 +4,7 @@ games/openclonk
 share/applications/openclonk.desktop
 share/games/openclonk/Arena.ocf
 share/games/openclonk/Decoration.ocd
+share/games/openclonk/Defense.ocf
 share/games/openclonk/Graphics.ocg
 share/games/openclonk/Material.ocg
 share/games/openclonk/Missions.ocf
@@ -12,7 +13,7 @@ share/games/openclonk/Objects.ocd
 share/games/openclonk/Parkour.ocf
 share/games/openclonk/Sound.ocg
 share/games/openclonk/System.ocg
-share/games/openclonk/Tutorial.ocf
+share/games/openclonk/Tutorials.ocf
 share/games/openclonk/Worlds.ocf
 share/icons/hicolor/128x128/apps/openclonk.png
 share/icons/hicolor/256x256/apps/openclonk.png

diff --git a/openclonk/distinfo b/openclonk/distinfo
index c18c8e291533b0881af39193720bbb48273426ef..6246b8ad01bccd59e1eec85384e8478c21167e2f 100644 (file)
--- a/openclonk/distinfo
+++ b/openclonk/distinfo
@@ -1,5 +1,7 @@
 $NetBSD$
 
-SHA1 (openclonk-6.1-src.tar.bz2) = fb467b5496c089cb85a0e83096a5fc3f0f43fbd5
-RMD160 (openclonk-6.1-src.tar.bz2) = 7bdaa368b73a32e3334203cb9d95eca0e9d89570
-Size (openclonk-6.1-src.tar.bz2) = 68861317 bytes
+SHA1 (openclonk-7.0-src.tar.bz2) = cd29fc094e605481ce3523fa6762bfa44ee02979
+RMD160 (openclonk-7.0-src.tar.bz2) = 9a5437b92ac75217898af028bc2857f99506b528
+Size (openclonk-7.0-src.tar.bz2) = 102143348 bytes
+SHA1 (patch-CMakeLists.txt) = 857d956eff7f5b2efae4c0f6561252a5dd581641
+SHA1 (patch-src_graphics_StdPNG.cpp) = 552c9526546dd4677c63d0d0f69f2194cd8d583a

diff --git a/openclonk/patches/patch-CMakeLists.txt b/openclonk/patches/patch-CMakeLists.txt
new file mode 100644 (file)
index 0000000..71bbef2
--- /dev/null
+++ b/openclonk/patches/patch-CMakeLists.txt
@@ -0,0 +1,12 @@
+$NetBSD$
+--- CMakeLists.txt.orig        2016-01-17 18:36:02.000000000 -0800
++++ CMakeLists.txt     2016-01-17 18:36:34.000000000 -0800
+@@ -1170,7 +1170,7 @@
+ 
+ if(GTK3_FOUND AND GTK3_gtksourceview_FOUND)
+       add_executable(mape ${MAPE_BASE_SOURCES} ${MAPE_SOURCES})
+-      set_property(TARGET mape APPEND PROPERTY COMPILE_FLAGS ${GTK3_COMPILE_DEFINITIONS})
++  target_compile_options(mape PRIVATE ${GTK_COMPILE_DEFINITIONS})
+       target_include_directories(mape PRIVATE ${GTK3_INCLUDE_DIRS} ${GTK3_gtksourceview_INCLUDE_DIRS})
+       target_link_libraries(mape
+               ${GTK3_LIBRARIES}

diff --git a/openclonk/patches/patch-src_graphics_StdPNG.cpp b/openclonk/patches/patch-src_graphics_StdPNG.cpp
new file mode 100644 (file)
index 0000000..ce4958f
--- /dev/null
+++ b/openclonk/patches/patch-src_graphics_StdPNG.cpp
@@ -0,0 +1,15 @@
+$NetBSD$
+--- src/graphics/StdPNG.cpp.orig       2016-01-17 18:37:04.000000000 -0800
++++ src/graphics/StdPNG.cpp    2016-01-17 18:37:14.000000000 -0800
+@@ -368,10 +368,8 @@
+               first = false;
+ #ifdef HAVE_WINTHREAD
+               Sleep(100);
+-#elif defined (__APPLE__)
++#else
+               sched_yield();
+-#elif defined(HAVE_PTHREAD)
+-              pthread_yield();
+ #endif
+       }
+ }