Attachment #160157 for bug #202532

View | Details | Raw Unified | Return to bug 202532
Collapse All | Expand All




USE_LDCONFIG=	yes

ONLY_FOR_ARCHS=	i386 amd64
#MAKE_ENV+=	c="${CC} -std=gnu99" cpp="${CXX} -std=gnu++0x"
MAKE_ENV+=	compiler="${CXX}" cflags="-x c -std=c99 ${CFLAGS}" \
		cppflags="-x c++ -std=c++11 ${CXXFLAGS}"


		${WRKSRC}/target-ethos/Makefile
	${REINPLACE_CMD} -e 's|/usr/share/|${PREFIX}/share/|' \
		${WRKSRC}/nall/string/platform.hpp

post-patch-DEBUG-on:
	${REINPLACE_CMD} -e 's|-O3|-g|g' \
		${WRKSRC}/ananke/Makefile \
		${WRKSRC}/Makefile
	${REINPLACE_CMD} -e 's|:= -s|:= #|g' \
		${WRKSRC}/Makefile
.endif
#	${RM} ${WRKSRC}/shaders/Sepia.Direct3D.shader

pre-build-QT4-on:
	(cd ${WRKSRC}/phoenix/qt && ${MOC} -i -o platform.moc platform.moc.hpp)

do-build:
.if ${PORT_OPTIONS:MQT4}
	(cd ${WRKSRC}/phoenix/qt && ${MOC} -i -o platform.moc platform.moc.hpp)
.endif
.for d in . ananke
	(cd ${WRKSRC}/${d} && ${MAKE_CMD} ${MAKE_ENV})
.endfor

Lines 1-6 Link Here

(-)files/patch-nall-platform.hpp (-3 / +3 lines)
1	--- ./nall/platform.hpp.orig 2014-03-16 21:33:25.000000000 -0400	1	--- nall/platform.hpp.orig 2014-01-20 06:37:12 UTC
2	+++ ./nall/platform.hpp 2014-03-16 21:45:07.000000000 -0400	2	+++ nall/platform.hpp
3	@@ -41,7 +41,7 @@	3	@@ -41,7 +41,7 @@ namespace Math {
4	#undef interface	4	#undef interface
5	#define dllexport __declspec(dllexport)	5	#define dllexport __declspec(dllexport)
6	#else	6	#else

Lines 1-6 Link Here

(-)files/patch-ruby__video__glx.cpp (-3 / +3 lines)
1	--- ./ruby/video/glx.cpp.orig 2014-01-20 01:37:14.000000000 -0500	1	--- ruby/video/glx.cpp.orig 2014-01-20 06:37:14 UTC
2	+++ ./ruby/video/glx.cpp 2014-06-02 23:32:39.000000000 -0400	2	+++ ruby/video/glx.cpp
3	@@ -128,6 +128,28 @@	3	@@ -128,6 +128,28 @@ struct pVideoGLX : OpenGL {
4	//require GLX 1.2+ API	4	//require GLX 1.2+ API
5	if(glx.version_major < 1 \|\| (glx.version_major == 1 && glx.version_minor < 2)) return false;	5	if(glx.version_major < 1 \|\| (glx.version_major == 1 && glx.version_minor < 2)) return false;
6		6




--- ./target-ethos/general/presentation.cpp.orig	2013-12-06 15:19:40.000000000 -0500
+++ ./target-ethos/general/presentation.cpp	2014-03-16 22:40:31.000000000 -0400
@@ -235,7 +235,7 @@
 void Presentation::loadShaders() {
   //only the OpenGL driver has video shader support
   if(config->video.driver == "OpenGL") {
-    string pathname = program->path("Video Shaders/");
+    string pathname = program->path("shaders/");
     lstring shaders = directory::folders(pathname, "*.shader");
     for(auto& name : shaders) {
       auto shader = new RadioItem;
--- ./target-ethos/utility/utility.cpp.orig	2013-12-21 02:00:03.000000000 -0500
+++ ./target-ethos/utility/utility.cpp	2014-03-16 22:41:03.000000000 -0400
@@ -203,7 +203,7 @@
     video.set(Video::Filter, Video::FilterLinear);
   } else if(config->video.shader == "Display Emulation") {
     if(program->active) {
-      string pathname = program->path("Video Shaders/");
+      string pathname = program->path("shaders/");
       pathname.append("Display Emulation/");
       pathname.append(presentation->systemName, ".shader/");
       if(directory::exists(pathname)) {

Lines 1-6 Link Here

(-)files/patch-target-ethos-Makefile (-3 / +3 lines)
1	--- ./target-ethos/Makefile.orig 2014-01-13 00:26:29.000000000 -0500	1	--- target-ethos/Makefile.orig 2014-01-13 05:26:29 UTC
2	+++ ./target-ethos/Makefile 2014-03-16 21:57:02.000000000 -0400	2	+++ target-ethos/Makefile
3	@@ -27,9 +27,9 @@	3	@@ -27,9 +27,9 @@ else ifeq ($(platform),linux)
4	ruby += audio.alsa audio.openal audio.oss audio.pulseaudio audio.pulseaudiosimple audio.ao	4	ruby += audio.alsa audio.openal audio.oss audio.pulseaudio audio.pulseaudiosimple audio.ao
5	ruby += input.udev input.sdl input.x	5	ruby += input.udev input.sdl input.x
6	else ifeq ($(platform),bsd)	6	else ifeq ($(platform),bsd)

Line 0 Link Here

(-)files/patch-target-ethos_general_presentation.cpp (+11 lines)
	1	--- target-ethos/general/presentation.cpp.orig 2013-12-06 20:19:40 UTC
	2	+++ target-ethos/general/presentation.cpp
	3	@@ -235,7 +235,7 @@ void Presentation::bootstrap() {
	4	void Presentation::loadShaders() {
	5	//only the OpenGL driver has video shader support
	6	if(config->video.driver == "OpenGL") {
	7	- string pathname = program->path("Video Shaders/");
	8	+ string pathname = program->path("shaders/");
	9	lstring shaders = directory::folders(pathname, "*.shader");
	10	for(auto& name : shaders) {
	11	auto shader = new RadioItem;

Line 0 Link Here

(-)files/patch-target-ethos_utility_utility.cpp (+11 lines)
	1	--- target-ethos/utility/utility.cpp.orig 2013-12-21 07:00:03 UTC
	2	+++ target-ethos/utility/utility.cpp
	3	@@ -203,7 +203,7 @@ void Utility::updateShader() {
	4	video.set(Video::Filter, Video::FilterLinear);
	5	} else if(config->video.shader == "Display Emulation") {
	6	if(program->active) {
	7	- string pathname = program->path("Video Shaders/");
	8	+ string pathname = program->path("shaders/");
	9	pathname.append("Display Emulation/");
	10	pathname.append(presentation->systemName, ".shader/");
	11	if(directory::exists(pathname)) {

Return to bug 202532

Lines 16-22 Link Here

(-)Makefile (-7 / +5 lines)
16	USE_LDCONFIG= yes	16	USE_LDCONFIG= yes
17		17
18	ONLY_FOR_ARCHS= i386 amd64	18	ONLY_FOR_ARCHS= i386 amd64
19	#MAKE_ENV+= c="${CC} -std=gnu99" cpp="${CXX} -std=gnu++0x"
20	MAKE_ENV+= compiler="${CXX}" cflags="-x c -std=c99 ${CFLAGS}" \	19	MAKE_ENV+= compiler="${CXX}" cflags="-x c -std=c99 ${CFLAGS}" \
21	cppflags="-x c++ -std=c++11 ${CXXFLAGS}"	20	cppflags="-x c++ -std=c++11 ${CXXFLAGS}"
22		21
Lines 118-136 Link Here
118	${WRKSRC}/target-ethos/Makefile	117	${WRKSRC}/target-ethos/Makefile
119	${REINPLACE_CMD} -e 's\|/usr/share/\|${PREFIX}/share/\|' \	118	${REINPLACE_CMD} -e 's\|/usr/share/\|${PREFIX}/share/\|' \
120	${WRKSRC}/nall/string/platform.hpp	119	${WRKSRC}/nall/string/platform.hpp
121	.if ${PORT_OPTIONS:MDEBUG}	120
		121	post-patch-DEBUG-on:
122	${REINPLACE_CMD} -e 's\|-O3\|-g\|g' \	122	${REINPLACE_CMD} -e 's\|-O3\|-g\|g' \
123	${WRKSRC}/ananke/Makefile \	123	${WRKSRC}/ananke/Makefile \
124	${WRKSRC}/Makefile	124	${WRKSRC}/Makefile
125	${REINPLACE_CMD} -e 's\|:= -s\|:= #\|g' \	125	${REINPLACE_CMD} -e 's\|:= -s\|:= #\|g' \
126	${WRKSRC}/Makefile	126	${WRKSRC}/Makefile
127	.endif
128	# ${RM} ${WRKSRC}/shaders/Sepia.Direct3D.shader
129		127
		128	pre-build-QT4-on:
		129	(cd ${WRKSRC}/phoenix/qt && ${MOC} -i -o platform.moc platform.moc.hpp)
		130
130	do-build:	131	do-build:
131	.if ${PORT_OPTIONS:MQT4}
132	(cd ${WRKSRC}/phoenix/qt && ${MOC} -i -o platform.moc platform.moc.hpp)
133	.endif
134	.for d in . ananke	132	.for d in . ananke
135	(cd ${WRKSRC}/${d} && ${MAKE_CMD} ${MAKE_ENV})	133	(cd ${WRKSRC}/${d} && ${MAKE_CMD} ${MAKE_ENV})
136	.endfor	134	.endfor

Lines 1-22 Link Here

(-)files/patch-shaders (-22 lines)
1	--- ./target-ethos/general/presentation.cpp.orig 2013-12-06 15:19:40.000000000 -0500
2	+++ ./target-ethos/general/presentation.cpp 2014-03-16 22:40:31.000000000 -0400
3	@@ -235,7 +235,7 @@
4	void Presentation::loadShaders() {
5	//only the OpenGL driver has video shader support
6	if(config->video.driver == "OpenGL") {
7	- string pathname = program->path("Video Shaders/");
8	+ string pathname = program->path("shaders/");
9	lstring shaders = directory::folders(pathname, "*.shader");
10	for(auto& name : shaders) {
11	auto shader = new RadioItem;
12	--- ./target-ethos/utility/utility.cpp.orig 2013-12-21 02:00:03.000000000 -0500
13	+++ ./target-ethos/utility/utility.cpp 2014-03-16 22:41:03.000000000 -0400
14	@@ -203,7 +203,7 @@
15	video.set(Video::Filter, Video::FilterLinear);
16	} else if(config->video.shader == "Display Emulation") {
17	if(program->active) {
18	- string pathname = program->path("Video Shaders/");
19	+ string pathname = program->path("shaders/");
20	pathname.append("Display Emulation/");
21	pathname.append(presentation->systemName, ".shader/");
22	if(directory::exists(pathname)) {