updated fheroes2 package to r3277

4 files changed, 58 insertions, 37 deletions

diff --git a/fheroes2/Makefile b/fheroes2/Makefile
index 820fcaa..32d42b1 100644
--- a/fheroes2/Makefile
+++ b/fheroes2/Makefile
@@ -1,12 +1,15 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=fheroes2
-PKG_VERSION:=r1954
-PKG_RELEASE:=1
+PKG_REV:=3277
+PKG_VERSION:=r$(PKG_REV)
+PKG_RELEASE:=2
 
-PKG_SOURCE:=fheroes2-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=@SF/fheroes2
-PKG_MD5SUM:=612a4fe2d18b748bc4367ffddff734b5
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=svn://svn.code.sf.net/p/fheroes2/code/trunk/fheroes2
+PKG_SOURCE_PROTO:=svn
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+PKG_SOURCE_VERSION:=$(PKG_REV)
 
 PKG_BUILD_DIR=$(BUILD_DIR)/fheroes2-$(PKG_VERSION)
 
@@ -15,7 +18,7 @@ include $(INCLUDE_DIR)/package.mk
 define Package/fheroes2
   SECTION:=games
   CATEGORY:=Games
-  DEPENDS:=+libsdl +libsdl-image +libpng +zlib
+  DEPENDS:=+libsdl +libsdl-image +libpng +zlib +libstdcpp
   TITLE:=Free Heroes 2 Engine
   URL:=http://sourceforge.net/projects/fheroes2/
   MENU:=1
@@ -79,7 +82,6 @@ endif
 EXTRA_LDFLAGS += $(shell $(STAGING_DIR)/root-xburst/usr/bin/directfb-config --libs --prefix=$(STAGING_DIR)/usr)
 
 EXTRA_CPPFLAGS += \
-	-D'CONFIGURE_FHEROES2_DATA=\"/usr/share/fheroes2\"' \
 	-DWITH_KEYMAPPING -DWITHOUT_MOUSE
 
 define Build/Configure
@@ -94,7 +96,7 @@ define Package/fheroes2/install
 	$(INSTALL_DIR) $(1)/usr/bin
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/fheroes2 $(1)/usr/bin/
 	$(INSTALL_DIR) $(1)/usr/share/fheroes2
-	$(INSTALL_DATA) $(SOURCE)/files/fheroes2.cfg $(1)/usr/share/fheroes2/
+	$(INSTALL_DATA) ./files/fheroes2.cfg $(1)/usr/share/fheroes2/
 	$(INSTALL_DIR) $(1)/usr/share/fheroes2/data
 	$(INSTALL_DIR) $(1)/usr/share/fheroes2/maps
 	$(CP) -r $(PKG_BUILD_DIR)/files $(1)/usr/share/fheroes2/
diff --git a/fheroes2/files/fheroes2.cfg b/fheroes2/files/fheroes2.cfg
index 155da24..c5d8282 100644
--- a/fheroes2/files/fheroes2.cfg
+++ b/fheroes2/files/fheroes2.cfg
@@ -1,11 +1,11 @@
 # Default config fheroes2.cfg options:
 #
 # path to directory data
-# data = /usr/share/fheroes2/data
+data = /usr/share/fheroes2/data
 #
 # path to directory maps, you can set few maps
-# maps = maps
-# maps = /usr/share/fheroes2/maps
+maps = /usr/share/fheroes2/maps
+# maps = c:\other_maps
 #
 # use alternative resource
 # alt resource = off
@@ -28,13 +28,25 @@ music = on
 # video mode (640x480, 800x576, 1024x768, 1280x1024 or other divisible 32)
 videomode = 320x240
 #
-# current animation speed: 0 - 10
-animation = 10
+# sdl video driver, windows: windib, directx, wince: gapi, raw, linux: x11, other see sdl manual
+# videdriver =
+#
+# heroes move speed: 0 - 10
+heroes speed = 10
+#
+# AI move speed: 0 - 10
+ai speed = 10
+#
+# battle speed: 0 - 10
+battle speed = 10
+#
+# scroll speed: 1 - 4
+# scroll speed = 2
 #
 # fullscreen: on off (F4 switch)
 fullscreen = on
 #
-# debug
+# debug (0 - 9)
 debug = off
 #
 # use ttf fonts
@@ -43,14 +55,18 @@ unicode = on
 # force lang
 # lang = en
 #
+# force encode maps text
+# maps charset =
+#
 # font name (only with unicode = on)
-# fonts normal = dejavusans.ttf
-# fonts small = dejavusans.ttf
+# fonts normal = bigfonts.ttf
+# fonts small = smallfonts.ttf
 # fonts normal size = 15
 # fonts small size = 10
 #
 # fonts render engine: (blended/solid) (only with unicode = on)
-fonts render = blended
+fonts small render = blended
+fonts normal render = blended
 #
 # network port:
 # port = 5154
@@ -63,6 +79,10 @@ pocket pc = on
 # pointer offset x = 0
 # pointer offset y = 0
 #
+# move mouse from keyboard (also see fheroes2.key):
+# emulate mouse = off
+# emulate mouse step = 10
+
 # virtual key mapping:
 # key_273 = '.'
 # key_275 = '/'
diff --git a/fheroes2/patches/0001-crosscompile.patch b/fheroes2/patches/0001-crosscompile.patch
new file mode 100644
index 0000000..364d1e8
--- /dev/null
+++ b/fheroes2/patches/0001-crosscompile.patch
@@ -0,0 +1,19 @@
+--- a/src/Makefile	2015-09-22 03:47:13.777305599 +0200
++++ b/src/Makefile	2015-09-22 03:48:24.565303557 +0200
+@@ -12,7 +12,7 @@
+ SDL_FLAGS := $(shell sdl-config --cflags)
+ endif
+ 
+-CFLAGS := $(CFLAGS) -Wall -fsigned-char
++CFLAGS := $(CFLAGS) $(CPPFLAGS) -Wall -fsigned-char
+ LDFLAGS := $(LDFLAGS)
+ LIBS :=
+ 
+--- a/src/Makefile.all	2015-09-22 03:49:00.833302511 +0200
++++ b/src/Makefile.all	2015-09-22 03:49:12.929302162 +0200
+@@ -1,4 +1,4 @@
+-AR := ar
++AR ?= ar
+ 
+ ifndef CXX
+ CXX := g++
diff --git a/fheroes2/patches/001-crosscompile.patch b/fheroes2/patches/001-crosscompile.patch
deleted file mode 100644
index ad1f5c2..0000000
--- a/fheroes2/patches/001-crosscompile.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/src/Makefile	2010-10-02 21:43:52.099078234 +0200
-+++ b/src/Makefile	2010-10-02 23:46:44.197838553 +0200
-@@ -6,8 +6,8 @@
- SDL_LIBS := $(shell sdl-config --libs)
- SDL_FLAGS := $(shell sdl-config --cflags)
- 
--CFLAGS := $(CFLAGS) -Wall -fsigned-char -DWITH_KEYMAPPING
--LDFLAGS :=
-+CFLAGS := $(CFLAGS) $(CPPFLAGS) -Wall -fsigned-char -DWITH_KEYMAPPING
-+LDFLAGS := $(LDFLAGS)
- LIBS :=
- 
- ifdef DEBUG
---- a/src/Makefile.unix	2010-10-02 21:43:38.669081686 +0200
-+++ b/src/Makefile.unix	2010-10-02 21:43:47.457845197 +0200
-@@ -1,2 +1,2 @@
--AR := ar
--CXX := g++
-+AR ?= ar
-+CXX ?= g++