Attachment #174013 for bug #212109

Lines 2-8 Link Here

(-)Makefile (-1 / +1 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= openmw	4	PORTNAME= openmw
5	PORTVERSION= 0.39.0	5	PORTVERSION= 0.40.0
6	DISTVERSIONPREFIX= openmw-	6	DISTVERSIONPREFIX= openmw-
7	CATEGORIES= games	7	CATEGORIES= games
8		8

Lines 1-2 Link Here

(-)distinfo (-2 / +3 lines)
1	SHA256 (OpenMW-openmw-openmw-0.39.0_GH0.tar.gz) = b0d294b0814099bd93326f7b86dd84fb727d38dd536bf104272112e6d70ae720	1	TIMESTAMP = 1472037205
2	SIZE (OpenMW-openmw-openmw-0.39.0_GH0.tar.gz) = 4764754	2	SHA256 (OpenMW-openmw-openmw-0.40.0_GH0.tar.gz) = 3f3ad6f29713bd27cbab5dbad7010212b7eba906f3b5542b5c5effb53e5d7944
		3	SIZE (OpenMW-openmw-openmw-0.40.0_GH0.tar.gz) = 4849783




--- CMakeLists.txt.orig	2016-08-24 11:14:36 UTC
+++ CMakeLists.txt
@@ -290,7 +290,7 @@ endif()
 find_package(Boost REQUIRED COMPONENTS ${BOOST_COMPONENTS})
 find_package(SDL2 REQUIRED)
 find_package(OpenAL REQUIRED)
-find_package(Bullet 283 REQUIRED COMPONENTS BulletCollision LinearMath)
+find_package(Bullet 282 REQUIRED COMPONENTS BulletCollision LinearMath)
+if (NOT BULLET_FOUND OR BULLET_VERSION VERSION_LESS 282)
     message(FATAL_ERROR "OpenMW requires Bullet version 2.83 or later")
 endif()
 
 include_directories("."
     SYSTEM

Lines 1-4 Link Here

(-)files/patch-apps_openmw_mwinput_inputmanagerimp.cpp (-1 / +1 lines)
1	--- apps/openmw/mwinput/inputmanagerimp.cpp.orig 2016-01-12 16:11:28 UTC	1	--- apps/openmw/mwinput/inputmanagerimp.cpp.orig 2016-08-15 09:27:54 UTC
2	+++ apps/openmw/mwinput/inputmanagerimp.cpp	2	+++ apps/openmw/mwinput/inputmanagerimp.cpp
3	@@ -119,11 +119,12 @@ namespace MWInput	3	@@ -119,11 +119,12 @@ namespace MWInput
4	SDL_ControllerDeviceEvent evt;	4	SDL_ControllerDeviceEvent evt;

Lines 1-6 Link Here

(-)files/patch-apps_wizard_CMakeLists.txt (-2 / +2 lines)
1	--- apps/wizard/CMakeLists.txt.orig 2016-04-06 11:40:42 UTC	1	--- apps/wizard/CMakeLists.txt.orig 2016-08-15 09:27:54 UTC
2	+++ apps/wizard/CMakeLists.txt	2	+++ apps/wizard/CMakeLists.txt
3	@@ -147,6 +147,7 @@ endif()	3	@@ -137,6 +137,7 @@ endif()
4		4
5	# Workaround for binutil => 2.23 problem when linking, should be fixed eventually upstream	5	# Workaround for binutil => 2.23 problem when linking, should be fixed eventually upstream
6	if (UNIX AND NOT APPLE)	6	if (UNIX AND NOT APPLE)

Lines 1-9 Link Here

(-)files/patch-files_gamecontrollerdb.txt (-5 / +5 lines)
1	--- files/gamecontrollerdb.txt.orig 2016-01-12 16:11:28 UTC	1	--- files/gamecontrollerdb.txt.orig 2016-08-15 09:27:54 UTC
2	+++ files/gamecontrollerdb.txt	2	+++ files/gamecontrollerdb.txt
3	@@ -99,3 +99,7 @@ ff113133000000000000504944564944,SVEN X-	3	@@ -150,3 +150,7 @@ AD1B00000000000001F9000000000000,Gamesto
4	05000000362800000100000002010000,OUYA Game Controller,a:b0,b:b3,dpdown:b9,dpleft:b10,dpright:b11,dpup:b8,guide:b14,leftshoulder:b4,leftstick:b6,lefttrigger:a2,leftx:a0,lefty:a1,platform:Linux,rightshoulder:b5,rightstick:b7,righttrigger:a5,rightx:a3,righty:a4,x:b1,y:b2,	4	03000000380700001647000010040000,Mad Catz Wired Xbox 360 Controller,platform:Linux,x:b2,a:b0,b:b1,y:b3,back:b6,guide:b8,start:b7,dpleft:h0.8,dpdown:h0.0,dpdown:h0.4,dpright:h0.0,dpright:h0.2,dpup:h0.0,dpup:h0.1,leftshoulder:h0.0,leftshoulder:b4,lefttrigger:a2,rightshoulder:b5,righttrigger:a5,leftstick:b9,rightstick:b10,leftx:a0,lefty:a1,rightx:a3,righty:a4,
5	05000000362800000100000003010000,OUYA Game Controller,a:b0,b:b3,dpdown:b9,dpleft:b10,dpright:b11,dpup:b8,guide:b14,leftshoulder:b4,leftstick:b6,lefttrigger:a2,leftx:a0,lefty:a1,platform:Linux,rightshoulder:b5,rightstick:b7,righttrigger:a5,rightx:a3,righty:a4,x:b1,y:b2,	5	030000006f0e00003901000020060000,Afterglow Wired Controller for Xbox One,x:b2,a:b0,b:b1,y:b3,back:b6,guide:b8,start:b7,dpleft:h0.8,dpdown:h0.4,dpright:h0.2,dpup:h0.1,leftshoulder:b4,lefttrigger:a2,rightshoulder:b5,righttrigger:a5,leftstick:b9,rightstick:b10,leftx:a0,lefty:a1,rightx:a3,righty:a4,platform:Linux,
6	030000008916000001fd000024010000,Razer Onza Classic Edition,platform:Linux,x:b2,a:b0,b:b1,y:b3,back:b6,guide:b8tart:b7,dpleft:b11,dpdown:b14,dpright:b12,dpup:b13,leftshoulder:b4,lefttrigger:a2,rightshoulder:b5,righttrigger:a5,leftstick:b9,rightstick:b10,leftx:a0,lefty:a1,rightx:a3,righty:a4,	6	030000004f04000015b3000010010000,Thrustmaster Dual Analog 4,platform:Linux,a:b0,b:b2,x:b1,y:b3,start:b9,back:b8,leftstick:b10,rightstick:b11,leftshoulder:b4,rightshoulder:b6,dpup:h0.1,dpleft:h0.8,dpdown:h0.4,dpright:h0.2,leftx:a0,lefty:a1,rightx:a2,righty:a3,lefttrigger:b5,righttrigger:b7,
7	+	7	+
8	+# FreeBSD	8	+# FreeBSD
9	+30783030303520283229000000000000,X360 Controller,platform:FreeBSD,x:b13,a:b11,b:b12,y:b14,back:b5,guide:b4,guide:b10,start:b4,dpleft:b2,dpdown:b1,dpright:b3,dpup:b0,leftshoulder:b8,lefttrigger:b9,lefttrigger:a2,rightshoulder:b9,righttrigger:a5,leftstick:b6,rightstick:b7,leftx:a0,lefty:a1,rightx:a3,righty:a4,	9	+30783030303520283229000000000000,X360 Controller,platform:FreeBSD,x:b13,a:b11,b:b12,y:b14,back:b5,guide:b4,guide:b10,start:b4,dpleft:b2,dpdown:b1,dpright:b3,dpup:b0,leftshoulder:b8,lefttrigger:b9,lefttrigger:a2,rightshoulder:b9,righttrigger:a5,leftstick:b6,rightstick:b7,leftx:a0,lefty:a1,rightx:a3,righty:a4,

Return to bug 212109

Lines 1-11 Link Here

(-)files/patch-CMakeLists.txt (-7 / +7 lines)
1	--- CMakeLists.txt.orig 2016-06-30 21:09:52 UTC	1	--- CMakeLists.txt.orig 2016-08-24 11:14:36 UTC
2	+++ CMakeLists.txt	2	+++ CMakeLists.txt
3	@@ -296,7 +296,7 @@ find_package(Boost REQUIRED COMPONENTS $	3	@@ -290,7 +290,7 @@ endif()
		4	find_package(Boost REQUIRED COMPONENTS ${BOOST_COMPONENTS})
4	find_package(SDL2 REQUIRED)	5	find_package(SDL2 REQUIRED)
5	find_package(OpenAL REQUIRED)	6	find_package(OpenAL REQUIRED)
6	find_package(Bullet REQUIRED)	7	-find_package(Bullet 283 REQUIRED COMPONENTS BulletCollision LinearMath)
7	-if (NOT BULLET_FOUND OR BULLET_VERSION VERSION_LESS 283)	8	+find_package(Bullet 282 REQUIRED COMPONENTS BulletCollision LinearMath)
8	+if (NOT BULLET_FOUND OR BULLET_VERSION VERSION_LESS 282)
9	message(FATAL_ERROR "OpenMW requires Bullet version 2.83 or later")
10	endif()
11		9
		10	include_directories("."
		11	SYSTEM