Attachment #201791 for bug #235478

Lines 7-12 Link Here

(-)games/opensonic/Makefile (-2 / +6 lines)
7	CATEGORIES= games	7	CATEGORIES= games
8	MASTER_SITES= SF/opensnc/Open%20Sonic/${PORTVERSION}	8	MASTER_SITES= SF/opensnc/Open%20Sonic/${PORTVERSION}
9	DISTNAME= opensnc-src-${PORTVERSION}	9	DISTNAME= opensnc-src-${PORTVERSION}
		10	DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
10		11
11	MAINTAINER= devel@stasyan.com	12	MAINTAINER= devel@stasyan.com
12	COMMENT= Game based on the "Sonic the Hedgehog" universe	13	COMMENT= Game based on the "Sonic the Hedgehog" universe
Lines 25-34 Link Here
25	false	26	false
26		27
27	USES= cmake	28	USES= cmake
28	CONFIGURE_ENV+= _ALLEGRO_LIBS="`allegro-config --libs`" \	29	USE_GITHUB= nodefault
		30	GH_TUPLE= t6:loggcompat:4.4.2:loggcompat
		31
		32	CONFIGURE_ENV= _ALLEGRO_LIBS="`allegro-config --libs`" \
29	_ALLEGRO_VERSION="`allegro-config --version`"	33	_ALLEGRO_VERSION="`allegro-config --version`"
30		34
31	CFLAGS+= -I${LOCALBASE}/include	35	CFLAGS+= -I${LOCALBASE}/include -I${WRKSRC_loggcompat}
32		36
33	post-patch:	37	post-patch:
34	@${REINPLACE_CMD} -e 's,/usr/bin,${PREFIX}/bin,g' \	38	@${REINPLACE_CMD} -e 's,/usr/bin,${PREFIX}/bin,g' \

Lines 1-2 Link Here

(-)games/opensonic/distinfo (+3 lines)
		1	TIMESTAMP = 1549471447
1	SHA256 (opensnc-src-0.1.4.tar.gz) = 3a4c3fa9538ee27c04b5ea848c9ad0a83f335471936d4617a18d3648c42588e9	2	SHA256 (opensnc-src-0.1.4.tar.gz) = 3a4c3fa9538ee27c04b5ea848c9ad0a83f335471936d4617a18d3648c42588e9
2	SIZE (opensnc-src-0.1.4.tar.gz) = 10525059	3	SIZE (opensnc-src-0.1.4.tar.gz) = 10525059
		4	SHA256 (t6-loggcompat-4.4.2_GH0.tar.gz) = 481fe569959eefa92d0babeca27709b2efcf7a815cd5c49596b6c0403db76a4e
		5	SIZE (t6-loggcompat-4.4.2_GH0.tar.gz) = 3105




--- CMakeLists.txt.orig	2010-09-19 18:31:26 UTC
+++ CMakeLists.txt
@@ -82,12 +82,6 @@ IF(NOT LJPGALLEG)
   MESSAGE(FATAL_ERROR "Fatal error: libjpgalleg not found! ${RTFM}")
 ENDIF(NOT LJPGALLEG)
 
-# LOGG: liblogg, libogg, libvorbis, libvorbisfile
-FIND_LIBRARY(LLOGG NAMES logg PATH "${CMAKE_LIBRARY_PATH}")
-IF(NOT LLOGG)
-  MESSAGE(FATAL_ERROR "Fatal error: liblogg not found! ${RTFM}")
-ENDIF(NOT LLOGG)
-
 FIND_LIBRARY(LOGG NAMES ogg PATH "${CMAKE_LIBRARY_PATH}")
 IF(NOT LOGG)
   MESSAGE(FATAL_ERROR "Fatal error: libogg not found! ${RTFM}")
@@ -150,6 +144,7 @@ SET(
   src/core/util.c
   src/core/v2d.c
   src/core/video.c
+  ../loggcompat-4.4.2/logg-4.4.2.c
 
   src/scenes/util/editorgrp.c
   src/scenes/util/grouptree.c
@@ -250,7 +245,7 @@ IF(UNIX)
   SET(GAME_SRCS ${GAME_SRCS} src/misc/iconlin.c)
   ADD_EXECUTABLE(${GAME_UNIXNAME} ${GAME_SRCS})
   SET_TARGET_PROPERTIES(${GAME_UNIXNAME} PROPERTIES LINK_FLAGS ${ALLEGRO_UNIX_LIBS})
-  TARGET_LINK_LIBRARIES(${GAME_UNIXNAME} m logg vorbisfile vorbis ogg jpgalleg z png loadpng)
+  TARGET_LINK_LIBRARIES(${GAME_UNIXNAME} m vorbisfile vorbis ogg jpgalleg z png loadpng)
   SET_TARGET_PROPERTIES(${GAME_UNIXNAME} PROPERTIES COMPILE_FLAGS "-Wall -O2 ${CFLAGS} ${CFLAGS_EXTRA}")
 ENDIF(UNIX)
 
@@ -392,10 +387,10 @@ IF(WIN32)
   # Other properties
   IF(MSVC)
     SET_TARGET_PROPERTIES(${GAME_UNIXNAME} PROPERTIES COMPILE_FLAGS "/D_CRT_SECURE_NO_DEPRECATE /D__WIN32__ /D__MSVC__ ${CFLAGS} ${CFLAGS_EXTRA}")
-    TARGET_LINK_LIBRARIES(${GAME_UNIXNAME} logg vorbisfile vorbis ogg jpgalleg loadpng alleg png z)
+    TARGET_LINK_LIBRARIES(${GAME_UNIXNAME} vorbisfile vorbis ogg jpgalleg loadpng alleg png z)
   ELSE(MSVC)
     SET_TARGET_PROPERTIES(${GAME_UNIXNAME} PROPERTIES COMPILE_FLAGS "-Wall -O2 -ansi ${CFLAGS} ${CFLAGS_EXTRA}")
-    TARGET_LINK_LIBRARIES(${GAME_UNIXNAME} m logg vorbisfile vorbis ogg jpgalleg loadpng alleg png z)
+    TARGET_LINK_LIBRARIES(${GAME_UNIXNAME} m vorbisfile vorbis ogg jpgalleg loadpng alleg png z)
     EXECUTE_PROCESS(COMMAND ${CMAKE_RC_COMPILER} -O coff -o src/misc/iconwin.res -i src/misc/iconwin.rc)
     SET_TARGET_PROPERTIES(${GAME_UNIXNAME} PROPERTIES LINK_FLAGS "src/misc/iconwin.res")
   ENDIF(MSVC)
@@ -410,16 +405,11 @@ SET_TARGET_PROPERTIES(${GAME_UNIXNAME} PROPERTIES PROJ
 
 # Installing on *nix
 IF(UNIX)
-  SET(GAME_INSTALL_DIR "/usr/share/${GAME_UNIXNAME}")

Line 0 Link Here

(-)games/opensonic/files/patch-src_core_audio.c (+11 lines)
	1	--- src/core/audio.c.orig 2019-02-06 16:44:28 UTC
	2	+++ src/core/audio.c
	3	@@ -18,7 +18,7 @@
	4	*/
	5
	6	#include <allegro.h>
	7	-#include <logg.h>
	8	+#include <logg-4.4.2.h>
	9	#include <stdlib.h>
	10	#include "audio.h"
	11	#include "osspec.h"

Return to bug 235478

Lines 1-7 Link Here

(-)games/opensonic/files/patch-CMakeLists.txt (-3 / +46 lines)
1	--- ./CMakeLists.txt.orig 2010-09-19 18:31:26.000000000 +0000	1	--- CMakeLists.txt.orig 2010-09-19 18:31:26 UTC
2	+++ ./CMakeLists.txt 2014-01-09 19:17:45.443017601 +0000	2	+++ CMakeLists.txt
3	@@ -410,16 +410,11 @@	3	@@ -82,12 +82,6 @@ IF(NOT LJPGALLEG)
		4	MESSAGE(FATAL_ERROR "Fatal error: libjpgalleg not found! ${RTFM}")
		5	ENDIF(NOT LJPGALLEG)
4		6
		7	-# LOGG: liblogg, libogg, libvorbis, libvorbisfile
		8	-FIND_LIBRARY(LLOGG NAMES logg PATH "${CMAKE_LIBRARY_PATH}")
		9	-IF(NOT LLOGG)
		10	- MESSAGE(FATAL_ERROR "Fatal error: liblogg not found! ${RTFM}")
		11	-ENDIF(NOT LLOGG)
		12	-
		13	FIND_LIBRARY(LOGG NAMES ogg PATH "${CMAKE_LIBRARY_PATH}")
		14	IF(NOT LOGG)
		15	MESSAGE(FATAL_ERROR "Fatal error: libogg not found! ${RTFM}")
		16	@@ -150,6 +144,7 @@ SET(
		17	src/core/util.c
		18	src/core/v2d.c
		19	src/core/video.c
		20	+ ../loggcompat-4.4.2/logg-4.4.2.c
		21
		22	src/scenes/util/editorgrp.c
		23	src/scenes/util/grouptree.c
		24	@@ -250,7 +245,7 @@ IF(UNIX)
		25	SET(GAME_SRCS ${GAME_SRCS} src/misc/iconlin.c)
		26	ADD_EXECUTABLE(${GAME_UNIXNAME} ${GAME_SRCS})
		27	SET_TARGET_PROPERTIES(${GAME_UNIXNAME} PROPERTIES LINK_FLAGS ${ALLEGRO_UNIX_LIBS})
		28	- TARGET_LINK_LIBRARIES(${GAME_UNIXNAME} m logg vorbisfile vorbis ogg jpgalleg z png loadpng)
		29	+ TARGET_LINK_LIBRARIES(${GAME_UNIXNAME} m vorbisfile vorbis ogg jpgalleg z png loadpng)
		30	SET_TARGET_PROPERTIES(${GAME_UNIXNAME} PROPERTIES COMPILE_FLAGS "-Wall -O2 ${CFLAGS} ${CFLAGS_EXTRA}")
		31	ENDIF(UNIX)
		32
		33	@@ -392,10 +387,10 @@ IF(WIN32)
		34	# Other properties
		35	IF(MSVC)
		36	SET_TARGET_PROPERTIES(${GAME_UNIXNAME} PROPERTIES COMPILE_FLAGS "/D_CRT_SECURE_NO_DEPRECATE /D__WIN32__ /D__MSVC__ ${CFLAGS} ${CFLAGS_EXTRA}")
		37	- TARGET_LINK_LIBRARIES(${GAME_UNIXNAME} logg vorbisfile vorbis ogg jpgalleg loadpng alleg png z)
		38	+ TARGET_LINK_LIBRARIES(${GAME_UNIXNAME} vorbisfile vorbis ogg jpgalleg loadpng alleg png z)
		39	ELSE(MSVC)
		40	SET_TARGET_PROPERTIES(${GAME_UNIXNAME} PROPERTIES COMPILE_FLAGS "-Wall -O2 -ansi ${CFLAGS} ${CFLAGS_EXTRA}")
		41	- TARGET_LINK_LIBRARIES(${GAME_UNIXNAME} m logg vorbisfile vorbis ogg jpgalleg loadpng alleg png z)
		42	+ TARGET_LINK_LIBRARIES(${GAME_UNIXNAME} m vorbisfile vorbis ogg jpgalleg loadpng alleg png z)
		43	EXECUTE_PROCESS(COMMAND ${CMAKE_RC_COMPILER} -O coff -o src/misc/iconwin.res -i src/misc/iconwin.rc)
		44	SET_TARGET_PROPERTIES(${GAME_UNIXNAME} PROPERTIES LINK_FLAGS "src/misc/iconwin.res")
		45	ENDIF(MSVC)
		46	@@ -410,16 +405,11 @@ SET_TARGET_PROPERTIES(${GAME_UNIXNAME} PROPERTIES PROJ
		47
5	# Installing on *nix	48	# Installing on *nix
6	IF(UNIX)	49	IF(UNIX)
7	- SET(GAME_INSTALL_DIR "/usr/share/${GAME_UNIXNAME}")	50	- SET(GAME_INSTALL_DIR "/usr/share/${GAME_UNIXNAME}")