- Update to 0.20

- Mark MAKE_JOBS_SAFE
- Add option to disable in game movies support

5 files changed, 130 insertions, 5 deletions

diff --git a/games/corsix-th/Makefile b/games/corsix-th/Makefile
index 58e8dd64def7..11bff010d0d0 100644
--- a/games/corsix-th/Makefile
+++ b/games/corsix-th/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	corsixth
-PORTVERSION=	0.11
-PORTREVISION=	1
+PORTVERSION=	0.20
 CATEGORIES=	games
 MASTER_SITES=	GOOGLE_CODE
 PROJECTHOST=	corsix-th
@@ -19,6 +18,33 @@ LIB_DEPENDS=	freetype:${PORTSDIR}/print/freetype2
 USES=		cmake
 USE_LUA=	yes
 USE_SDL=	mixer
+MAKE_JOBS_SAFE=	yes
+USE_DOS2UNIX=	CMake/FindFFmpeg.cmake \
+		CorsixTH/CMakeLists.txt
+
+OPTIONS_DEFINE=	MOVIES
+OPTIONS_DEFAULT=	MOVIES
+MOVIES_DESC=	Play in-game movies
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MMOVIES}
+CMAKE_ARGS+=	-DWITH_MOVIES=ON
+LIB_DEPENDS+=	swresample1:${PORTSDIR}/multimedia/ffmpeg1
+.else
+CMAKE_ARGS+=	-DWITH_MOVIES=OFF
+.endif
+
+# partly copied from editors/libreoffice
+.if ${ARCH} == "i386"
+.if exists(/usr/bin/clang) && ${OSVERSION} > 900014
+CC=		/usr/bin/clang
+CPP=		/usr/bin/clang-cpp
+CXX=		/usr/bin/clang++
+.else
+USE_GCC=	4.6+
+.endif
+.endif
 
 post-patch:
 # Allow the game to find its resources without wrapper scripts
diff --git a/games/corsix-th/distinfo b/games/corsix-th/distinfo
index 3b5ffea500e4..5587b7314d68 100644
--- a/games/corsix-th/distinfo
+++ b/games/corsix-th/distinfo
@@ -1,2 +1,2 @@
-SHA256 (CorsixTH-0.11-Source.tar.gz) = a6ca2e4461c76d06f07f83c90a81e2793035f1151b183804b5e274af7484da55
-SIZE (CorsixTH-0.11-Source.tar.gz) = 3725690
+SHA256 (CorsixTH-0.20-Source.tar.gz) = fc139503697a43ab6ba125528d1883e50a14ab114ff7cba77d02eaf440e1ee2e
+SIZE (CorsixTH-0.20-Source.tar.gz) = 3901803
diff --git a/games/corsix-th/files/patch-CMake-FindFFmpeg.cmake b/games/corsix-th/files/patch-CMake-FindFFmpeg.cmake
new file mode 100644
index 000000000000..2ec3d6adb514
--- /dev/null
+++ b/games/corsix-th/files/patch-CMake-FindFFmpeg.cmake
@@ -0,0 +1,44 @@
+--- CMake/FindFFmpeg.cmake.orig	2013-03-24 17:28:47.675682879 +0100
++++ CMake/FindFFmpeg.cmake	2013-03-24 17:29:04.915681918 +0100
+@@ -70,16 +70,16 @@
+ 
+   find_path(${_component}_INCLUDE_DIRS ${_header}
+     HINTS
+-      ${PC_LIB${_component}_INCLUDEDIR}
+-      ${PC_LIB${_component}_INCLUDE_DIRS}
++      ${PC_${_component}_INCLUDEDIR}
++      ${PC_${_component}_INCLUDE_DIRS}
+     PATH_SUFFIXES
+       ffmpeg
+   )
+ 
+   find_library(${_component}_LIBRARIES NAMES ${_library}
+       HINTS
+-      ${PC_LIB${_component}_LIBDIR}
+-      ${PC_LIB${_component}_LIBRARY_DIRS}
++      ${PC_${_component}_LIBDIR}
++      ${PC_${_component}_LIBRARY_DIRS}
+   )
+ 
+   set(${_component}_DEFINITIONS  ${PC_${_component}_CFLAGS_OTHER} CACHE STRING "The ${_component} CFLAGS.")
+@@ -94,13 +94,13 @@
+ if (NOT FFMPEG_LIBRARIES)
+ 
+   # Check for all possible component.
+-  find_component(AVCODEC  libavcodec  avcodec  libavcodec/avcodec.h)
+-  find_component(AVFORMAT libavformat avformat libavformat/avformat.h)
+-  find_component(AVDEVICE libavdevice avdevice libavdevice/avdevice.h)
+-  find_component(AVUTIL   libavutil   avutil   libavutil/avutil.h)
+-  find_component(SWSCALE  libswscale  swscale  libswscale/swscale.h)
+-  find_component(POSTPROC libpostproc postproc libpostproc/postprocess.h)
+-  find_component(SWRESAMPLE libswresample swresample libswresample/swresample.h)
++  find_component(AVCODEC  libavcodec1  avcodec1  libavcodec/avcodec.h)
++  find_component(AVFORMAT libavformat1 avformat1 libavformat/avformat.h)
++  find_component(AVDEVICE libavdevice1 avdevice1 libavdevice/avdevice.h)
++  find_component(AVUTIL   libavutil1   avutil1   libavutil/avutil.h)
++  find_component(SWSCALE  libswscale1  swscale1  libswscale/swscale.h)
++  find_component(POSTPROC libpostproc1 postproc1 libpostproc/postprocess.h)
++  find_component(SWRESAMPLE libswresample1 swresample1 libswresample/swresample.h)
+ 
+   # Check if the required components were found and add their stuff to the FFMPEG_* vars.
+   foreach (_component ${FFmpeg_FIND_COMPONENTS})
diff --git a/games/corsix-th/files/patch-CorsixTH-CMakeLists.txt b/games/corsix-th/files/patch-CorsixTH-CMakeLists.txt
new file mode 100644
index 000000000000..ac4957410900
--- /dev/null
+++ b/games/corsix-th/files/patch-CorsixTH-CMakeLists.txt
@@ -0,0 +1,46 @@
+--- CorsixTH/CMakeLists.txt.orig	2013-03-24 19:01:59.745454897 +0100
++++ CorsixTH/CMakeLists.txt	2013-03-24 19:03:14.618396915 +0100
+@@ -88,6 +88,21 @@
+ 
+ # Finding libraries
+ 
++# Find FFMPEG
++IF(CORSIX_TH_USE_FFMPEG)
++	FIND_PACKAGE(FFmpeg COMPONENTS AVFORMAT AVCODEC AVUTIL SWSCALE SWRESAMPLE REQUIRED)
++  IF(FFMPEG_FOUND)
++    TARGET_LINK_LIBRARIES(CorsixTH ${FFMPEG_LIBRARIES})
++    INCLUDE_DIRECTORIES(${FFMPEG_INCLUDE_DIRS})
++    IF(APPLE)
++      TARGET_LINK_LIBRARIES(CorsixTH libz.dylib)
++    ENDIF()
++    message("  FFmpeg found")
++  ELSE(FFMPEG_FOUND)
++    message("Error: FFmpeg library not found, even though it was selected to be included")
++  ENDIF(FFMPEG_FOUND)
++ENDIF(CORSIX_TH_USE_FFMPEG)
++
+ # Find SDL
+ FIND_PACKAGE(SDL REQUIRED)
+ IF(SDL_FOUND)
+@@ -131,21 +146,6 @@
+ 
+ message( STATUS "CMAKE_MODULE_PATH=${CMAKE_MODULE_PATH}" )
+ 
+-# Find FFMPEG
+-IF(CORSIX_TH_USE_FFMPEG)
+-	FIND_PACKAGE(FFmpeg COMPONENTS AVFORMAT AVCODEC AVUTIL SWSCALE SWRESAMPLE REQUIRED)
+-  IF(FFMPEG_FOUND)
+-    TARGET_LINK_LIBRARIES(CorsixTH ${FFMPEG_LIBRARIES})
+-    INCLUDE_DIRECTORIES(${FFMPEG_INCLUDE_DIRS})
+-    IF(APPLE)
+-      TARGET_LINK_LIBRARIES(CorsixTH libz.dylib)
+-    ENDIF()
+-    message("  FFmpeg found")
+-  ELSE(FFMPEG_FOUND)
+-    message("Error: FFmpeg library not found, even though it was selected to be included")
+-  ENDIF(FFMPEG_FOUND)
+-ENDIF(CORSIX_TH_USE_FFMPEG)
+-
+ # Find Freetype2
+ IF(CORSIX_TH_USE_FREETYPE2)
+   FIND_PACKAGE(Freetype REQUIRED)
diff --git a/games/corsix-th/pkg-plist b/games/corsix-th/pkg-plist
index 9d8af3306b7e..4b3c9fe900f6 100644
--- a/games/corsix-th/pkg-plist
+++ b/games/corsix-th/pkg-plist
@@ -55,8 +55,12 @@ bin/CorsixTH
 %%DATADIR%%/Levels/Example.map
 %%DATADIR%%/Levels/avatar.level
 %%DATADIR%%/Levels/avatar.map
+%%DATADIR%%/Levels/confined_v5.map
+%%DATADIR%%/Levels/confined_v5.level
 %%DATADIR%%/Levels/demo.level
 %%DATADIR%%/Levels/example.level
+%%DATADIR%%/Levels/finisham.map
+%%DATADIR%%/Levels/finisham.level
 %%DATADIR%%/Levels/original05.level
 %%DATADIR%%/Levels/original07.level
 %%DATADIR%%/Levels/original11.level
@@ -109,7 +113,9 @@ bin/CorsixTH
 %%DATADIR%%/Lua/dialogs/resizables/calls_dispatcher.lua
 %%DATADIR%%/Lua/dialogs/resizables/cheats.lua
 %%DATADIR%%/Lua/dialogs/resizables/directory_browser.lua
+%%DATADIR%%/Lua/dialogs/resizables/dropdown.lua
 %%DATADIR%%/Lua/dialogs/resizables/file_browser.lua
+%%DATADIR%%/Lua/dialogs/resizables/file_browsers/choose_font.lua
 %%DATADIR%%/Lua/dialogs/resizables/file_browsers/load_game.lua
 %%DATADIR%%/Lua/dialogs/resizables/file_browsers/save_game.lua
 %%DATADIR%%/Lua/dialogs/resizables/lua_console.lua
@@ -200,6 +206,7 @@ bin/CorsixTH
 %%DATADIR%%/Lua/humanoid_actions/walk.lua
 %%DATADIR%%/Lua/humanoid_actions/yawn.lua
 %%DATADIR%%/Lua/key_mapping.lua
+%%DATADIR%%/Lua/languages/brazilian_portuguese.lua
 %%DATADIR%%/Lua/languages/czech.lua
 %%DATADIR%%/Lua/languages/danish.lua
 %%DATADIR%%/Lua/languages/developer.lua
@@ -208,17 +215,19 @@ bin/CorsixTH
 %%DATADIR%%/Lua/languages/finnish.lua
 %%DATADIR%%/Lua/languages/french.lua
 %%DATADIR%%/Lua/languages/german.lua
+%%DATADIR%%/Lua/languages/hungarian.lua
+%%DATADIR%%/Lua/languages/iberic_portuguese.lua
 %%DATADIR%%/Lua/languages/italian.lua
 %%DATADIR%%/Lua/languages/norwegian.lua
 %%DATADIR%%/Lua/languages/original_strings.lua
 %%DATADIR%%/Lua/languages/polish.lua
-%%DATADIR%%/Lua/languages/portuguese.lua
 %%DATADIR%%/Lua/languages/russian.lua
 %%DATADIR%%/Lua/languages/simplified_chinese.lua
 %%DATADIR%%/Lua/languages/spanish.lua
 %%DATADIR%%/Lua/languages/swedish.lua
 %%DATADIR%%/Lua/languages/traditional_chinese.lua
 %%DATADIR%%/Lua/map.lua
+%%DATADIR%%/Lua/movie_player.lua
 %%DATADIR%%/Lua/objects/analyser.lua
 %%DATADIR%%/Lua/objects/autopsy.lua
 %%DATADIR%%/Lua/objects/bed.lua