Date: Mon, 18 Feb 2019 11:39:08 +0000 (UTC) From: Tobias Kortkamp <tobik@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r493257 - in head/games/opensonic: . files Message-ID: <201902181139.x1IBd8gs039818@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tobik Date: Mon Feb 18 11:39:08 2019 New Revision: 493257 URL: https://svnweb.freebsd.org/changeset/ports/493257 Log: games/opensonic: Prepare for Allegro 4.4.3, add wrapper script - struct LOGG in liblogg from Allegro 4.4.3 was made opaque. Opensonic directly manipulates it however. Integrate liblogg from Allegro 4.4.2 to preserve this port. - Add a wrapper script so that opensonic can find its data files when you run 'opensonic' or start it from your desktop PR: 235478 Submitted by: tobik Approved by: devel@stasyan.com (maintainer timeout, 2 weeks) Added: head/games/opensonic/files/opensonic.in (contents, props changed) head/games/opensonic/files/patch-src_core_audio.c (contents, props changed) Modified: head/games/opensonic/Makefile head/games/opensonic/distinfo head/games/opensonic/files/patch-CMakeLists.txt Modified: head/games/opensonic/Makefile ============================================================================== --- head/games/opensonic/Makefile Mon Feb 18 10:29:55 2019 (r493256) +++ head/games/opensonic/Makefile Mon Feb 18 11:39:08 2019 (r493257) @@ -3,10 +3,11 @@ PORTNAME= opensonic PORTVERSION= 0.1.4 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= games MASTER_SITES= SF/opensnc/Open%20Sonic/${PORTVERSION} DISTNAME= opensnc-src-${PORTVERSION} +DISTFILES= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= devel@stasyan.com COMMENT= Game based on the "Sonic the Hedgehog" universe @@ -25,11 +26,16 @@ DESKTOP_ENTRIES="${PORTNAME}" \ false USES= cmake -CONFIGURE_ENV+= _ALLEGRO_LIBS="`allegro-config --libs`" \ +USE_GITHUB= nodefault +GH_TUPLE= t6:loggcompat:4.4.2:loggcompat + +CONFIGURE_ENV= _ALLEGRO_LIBS="`allegro-config --libs`" \ _ALLEGRO_VERSION="`allegro-config --version`" -CFLAGS+= -I${LOCALBASE}/include +CFLAGS+= -I${LOCALBASE}/include -I${WRKSRC_loggcompat} +SUB_FILES= opensonic + post-patch: @${REINPLACE_CMD} -e 's,/usr/bin,${PREFIX}/bin,g' \ -e 's,/usr/share,${PREFIX}/share,g' \ @@ -37,6 +43,6 @@ post-patch: post-install: ${INSTALL_DATA} ${WRKSRC}/icon.png ${STAGEDIR}${PREFIX}/share/pixmaps/opensonic.png - ${LN} -s ${DATADIR}/opensonic ${STAGEDIR}${PREFIX}/bin/opensonic + ${INSTALL_SCRIPT} ${WRKDIR}/opensonic ${STAGEDIR}${PREFIX}/bin .include <bsd.port.mk> Modified: head/games/opensonic/distinfo ============================================================================== --- head/games/opensonic/distinfo Mon Feb 18 10:29:55 2019 (r493256) +++ head/games/opensonic/distinfo Mon Feb 18 11:39:08 2019 (r493257) @@ -1,2 +1,5 @@ +TIMESTAMP = 1549471447 SHA256 (opensnc-src-0.1.4.tar.gz) = 3a4c3fa9538ee27c04b5ea848c9ad0a83f335471936d4617a18d3648c42588e9 SIZE (opensnc-src-0.1.4.tar.gz) = 10525059 +SHA256 (t6-loggcompat-4.4.2_GH0.tar.gz) = 481fe569959eefa92d0babeca27709b2efcf7a815cd5c49596b6c0403db76a4e +SIZE (t6-loggcompat-4.4.2_GH0.tar.gz) = 3105 Added: head/games/opensonic/files/opensonic.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/opensonic/files/opensonic.in Mon Feb 18 11:39:08 2019 (r493257) @@ -0,0 +1,3 @@ +#!/bin/sh +cd %%DATADIR%% +exec ./opensonic "$@" Modified: head/games/opensonic/files/patch-CMakeLists.txt ============================================================================== --- head/games/opensonic/files/patch-CMakeLists.txt Mon Feb 18 10:29:55 2019 (r493256) +++ head/games/opensonic/files/patch-CMakeLists.txt Mon Feb 18 11:39:08 2019 (r493257) @@ -1,6 +1,49 @@ ---- ./CMakeLists.txt.orig 2010-09-19 18:31:26.000000000 +0000 -+++ ./CMakeLists.txt 2014-01-09 19:17:45.443017601 +0000 -@@ -410,16 +410,11 @@ +--- 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) Added: head/games/opensonic/files/patch-src_core_audio.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/opensonic/files/patch-src_core_audio.c Mon Feb 18 11:39:08 2019 (r493257) @@ -0,0 +1,11 @@ +--- src/core/audio.c.orig 2019-02-06 16:44:28 UTC ++++ src/core/audio.c +@@ -18,7 +18,7 @@ + */ + + #include <allegro.h> +-#include <logg.h> ++#include <logg-4.4.2.h> + #include <stdlib.h> + #include "audio.h" + #include "osspec.h"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201902181139.x1IBd8gs039818>