opensonic: fix build, but also broken (ELF in /usr/share)

This commit is contained in:
q66 2020-01-02 01:21:29 +01:00
parent f6ff955927
commit 3b8aa29c0b
2 changed files with 91 additions and 4 deletions

View File

@ -0,0 +1,77 @@
Source: FreeBSD
--- 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}")
- SET(GAME_FINAL_DIR "/usr/bin")
+ SET(GAME_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/share/${GAME_UNIXNAME}")
+ SET(GAME_FINAL_DIR "${CMAKE_INSTALL_PREFIX}/bin")
INSTALL(CODE "MESSAGE(\"Installing ${GAME_NAME} ${GAME_VERSION}... Make sure you have root privileges.\")")
INSTALL(TARGETS ${GAME_UNIXNAME} RUNTIME DESTINATION ${GAME_INSTALL_DIR})
INSTALL(FILES license.txt readme.html DESTINATION ${GAME_INSTALL_DIR})
INSTALL(DIRECTORY objects sprites config images levels licenses musics quests samples screenshots themes languages DESTINATION ${GAME_INSTALL_DIR} PATTERN ".svn" EXCLUDE)
-
- INSTALL(CODE "MESSAGE(\"Creating files at ${GAME_FINAL_DIR}...\")")
- INSTALL(CODE "EXECUTE_PROCESS(COMMAND \"cmake\" \"-E\" \"copy\" \"${GAME_INSTALL_DIR}/${GAME_UNIXNAME}\" \"${GAME_FINAL_DIR}/${GAME_UNIXNAME}\")")
-
- INSTALL(CODE "MESSAGE(\"Done! Please run ${GAME_UNIXNAME} to start ${GAME_NAME}.\")")
ENDIF(UNIX)
--- 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"

View File

@ -1,7 +1,7 @@
# Template file for 'opensonic' # Template file for 'opensonic'
pkgname=opensonic pkgname=opensonic
version=0.1.4 version=0.1.4
revision=7 revision=8
wrksrc="opensnc-src-${version}" wrksrc="opensnc-src-${version}"
build_style=gnu-makefile build_style=gnu-makefile
hostmakedepends="cmake" hostmakedepends="cmake"
@ -11,11 +11,21 @@ short_desc="Open-source game based on the Sonic the Hedgehog universe"
maintainer="Orphaned <orphan@voidlinux.org>" maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later" license="GPL-2.0-or-later"
homepage="http://opensnc.sourceforge.net/" homepage="http://opensnc.sourceforge.net/"
distfiles="${SOURCEFORGE_SITE}/opensnc/opensnc-src-${version}.tar.gz" _loggcompat_ver=4.4.2
checksum=3a4c3fa9538ee27c04b5ea848c9ad0a83f335471936d4617a18d3648c42588e9 distfiles="${SOURCEFORGE_SITE}/opensnc/opensnc-src-${version}.tar.gz
https://github.com/t6/loggcompat/archive/${_loggcompat_ver}.tar.gz"
checksum="3a4c3fa9538ee27c04b5ea848c9ad0a83f335471936d4617a18d3648c42588e9
481fe569959eefa92d0babeca27709b2efcf7a815cd5c49596b6c0403db76a4e"
broken="ELF in /usr/share"
post_extract() {
mv ${XBPS_BUILDDIR}/loggcompat-${_loggcompat_ver} .
}
do_configure() { do_configure() {
LDFLAGS="$LDFLAGS -Wl,--no-as-needed" ./configure --prefix=/usr LDFLAGS="-Wl,--no-as-needed" \
CFLAGS="-Iloggcompat-${_loggcompat_ver}" \
./configure -DCMAKE_INSTALL_PREFIX=/usr
} }
post_install() { post_install() {