cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to 1.3.0

Browse Source
This commit is contained in:
jsg 2011-05-29 14:05:15 +00:00
parent b2d8ae0b94
commit 2c18d7c4a0
5 changed files with 54 additions and 162 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
games/scummvm-tools/Makefile
View File

@ -1,8 +1,7 @@
# $OpenBSD: Makefile,v 1.17 2010/11/16 11:23:28 espie Exp $
# XXX hardcoded endian list
# $OpenBSD: Makefile,v 1.18 2011/05/29 14:05:15 jsg Exp $
COMMENT= collection of various tools for scummvm
DISTNAME= scummvm-tools-1.0.0
DISTNAME= scummvm-tools-1.3.0
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=scummvm/}
@ -15,38 +14,43 @@ PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB= c m ogg stdc++ z FLAC png vorbis vorbisenc
WANTLIB= c m ogg stdc++ z FLAC mad png pthread vorbis \
vorbisenc vorbisfile \
wx_base_net wx_base wx_base_odbc wx_base_xml \
wx_gtk2_adv wx_gtk2_aui wx_gtk2_core \
wx_gtk2_dbgrid wx_gtk2_html wx_gtk2_qa \
wx_gtk2_richtext wx_gtk2_xrc
NO_REGRESS= Yes
USE_GMAKE= Yes
.if (!${MACHINE_ARCH} == "alpha" && !${MACHINE_ARCH} == "amd64" && \
!${MACHINE_ARCH} == "arm" && !${MACHINE_ARCH} == "i386" && \
!${MACHINE_ARCH} == "vax")
CFLAGS+= -DSCUMM_BIG_ENDIAN
CXXFLAGS+= -DSCUMM_BIG_ENDIAN
.endif
LIB_DEPENDS= audio/flac \
graphics/png \
audio/libvorbis
audio/libvorbis \
audio/libmad \
x11/wxWidgets
RUN_DEPENDS= audio/lame \
audio/vorbis-tools
CONFIGURE_STYLE=simple
CONFIGURE_ARGS+=--disable-boost
CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
do-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/scummvm-tools
${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/scummvm-tools
${INSTALL_DATA_DIR} ${PREFIX}/share/scummvm-tools
${INSTALL_DATA} ${WRKSRC}/gui/media/{logo.jpg,detaillogo.jpg,tile.gif} \
${PREFIX}/share/scummvm-tools
${INSTALL_PROGRAM} \
${WRKBUILD}/compress_{agos,gob,kyra,queen,saga} \
${WRKBUILD}/compress_{scumm_bun,scumm_san,scumm_sou} \
${WRKBUILD}/compress_{sword1,sword2,tinsel,touche,tucker} \
${WRKBUILD}/de{cine,kyra,scumm,sword2,gob} \
${WRKBUILD}/encode_dxa \
${WRKBUILD}/extract_{agos,cine,cruise_pc,kyra,loom_tg16} \
${WRKBUILD}/extract_{mm_apple,mm_c64,mm_nes,parallaction} \
${WRKBUILD}/extract_{scumm_mac,t7g_mac,zak_c64,gob_stk} \
${WRKBUILD}/scummvm-tools \
${WRKBUILD}/scummvm-tools-cli \
${WRKBUILD}/de{cine,kyra,scumm,sword2,gob,riven} \
${WRKBUILD}/extract_mohawk \
${WRKBUILD}/construct_mohawk \
${WRKBUILD}/gob_loadcalc \
${PREFIX}/bin
.include <bsd.port.mk>

10
games/scummvm-tools/distinfo
View File

@ -1,5 +1,5 @@
MD5 (scummvm-tools-1.0.0.tar.gz) = 3gw1+HUfTi8P+KePK4whKQ==
RMD160 (scummvm-tools-1.0.0.tar.gz) = BqZ2xRkw+o/j6VRkSjhOXDVbbPQ=
SHA1 (scummvm-tools-1.0.0.tar.gz) = DidAPads1cDcZN1FkdmnlBBh63M=
SHA256 (scummvm-tools-1.0.0.tar.gz) = 9/nJWa6FL6QqBfG8q0THuCpJHxt/kOxs30lACKQB4CU=
SIZE (scummvm-tools-1.0.0.tar.gz) = 292372
MD5 (scummvm-tools-1.3.0.tar.gz) = AjnLAi5QjyOZ1YTvpvF3sg==
RMD160 (scummvm-tools-1.3.0.tar.gz) = nB/b/x+NaX1RsVdrjbuFHTbXqH8=
SHA1 (scummvm-tools-1.3.0.tar.gz) = r0lDP6mANFAMGQWe8slLfDr9e9s=
SHA256 (scummvm-tools-1.3.0.tar.gz) = M6R6ovTFWzYt+3/ZBgOqZNJi2dfY2GKsO+8OkHn4L8A=
SIZE (scummvm-tools-1.3.0.tar.gz) = 931766

108
games/scummvm-tools/patches/patch-Makefile
View File

@ -1,108 +0,0 @@
$OpenBSD: patch-Makefile,v 1.8 2009/12/09 21:55:01 jsg Exp $
--- Makefile.orig Sat Nov 7 00:56:59 2009
+++ Makefile Sat Nov 14 12:05:40 2009
@@ -9,7 +9,7 @@ srcdir ?= .
DEFINES := -DUNIX
LDFLAGS := $(LDFLAGS)
-INCLUDES := -I. -I$(srcdir)
+INCLUDES := -I. -I$(srcdir) `pkg-config --cflags libpng vorbis vorbisenc`
LIBS :=
OBJS :=
DEPDIR := .deps
@@ -19,8 +19,6 @@ DEPDIR := .deps
# manually create a config.mk files with overrides, if needed.
-include config.mk
-CXXFLAGS += -g -O -Wuninitialized
-
# Additional warnings
CXXFLAGS:= -Wall $(CXXFLAGS)
# Turn off some annoying and not-so-useful warnings
@@ -46,8 +44,8 @@ RM ?= rm -f
RM_REC ?= $(RM) -r
ZIP ?= zip -q
-CC := gcc
-CXX := g++
+#CC := gcc
+#CXX := g++
#######################################################################
@@ -89,8 +87,8 @@ TARGETS := \
extract_scumm_mac$(EXEEXT) \
extract_t7g_mac$(EXEEXT) \
extract_zak_c64$(EXEEXT) \
- extract_gob_stk$(EXEEXT) \
- tools_gui$(EXEEXT)
+ extract_gob_stk$(EXEEXT)
+# tools_gui$(EXEEXT)
UTILS := \
utils/adpcm.o \
@@ -117,43 +115,43 @@ bundle: $(TARGETS)
mv $(bundle_name)/Contents/Resources/tools_gui $(bundle_name)/Contents/MacOS/
compress_agos$(EXEEXT): compress_agos.o compress.o util.o
- $(CXX) $(LDFLAGS) -o $@ $+ -lvorbis -logg -lvorbisenc -lFLAC
+ $(CXX) $(LDFLAGS) -o $@ $+ `pkg-config --libs vorbis vorbisenc flac`
compress_gob$(EXEEXT): compress_gob.o util.o
$(CXX) $(LDFLAGS) -o $@ $+
compress_kyra$(EXEEXT): compress_kyra.o kyra_pak.o compress.o util.o
- $(CXX) $(LDFLAGS) -o $@ $+ -lvorbis -logg -lvorbisenc -lFLAC
+ $(CXX) $(LDFLAGS) -o $@ $+ `pkg-config --libs vorbis vorbisenc flac`
compress_queen$(EXEEXT): compress_queen.o compress.o util.o
- $(CXX) $(LDFLAGS) -o $@ $+ -lvorbis -logg -lvorbisenc -lFLAC
+ $(CXX) $(LDFLAGS) -o $@ $+ `pkg-config --libs vorbis vorbisenc flac`
compress_saga$(EXEEXT): compress_saga.o compress.o util.o $(UTILS)
- $(CXX) $(LDFLAGS) -o $@ $+ -lvorbis -logg -lvorbisenc -lFLAC
+ $(CXX) $(LDFLAGS) -o $@ $+ `pkg-config --libs vorbis vorbisenc flac`
compress_scumm_bun$(EXEEXT): compress_scumm_bun.o compress.o util.o
- $(CXX) $(LDFLAGS) -o $@ $+ -lvorbis -logg -lvorbisenc -lFLAC
+ $(CXX) $(LDFLAGS) -o $@ $+ `pkg-config --libs vorbis vorbisenc flac`
compress_scumm_san$(EXEEXT): compress_scumm_san.o compress.o util.o
- $(CXX) $(LDFLAGS) -o $@ $+ -lz -lvorbis -logg -lvorbisenc -lFLAC
+ $(CXX) $(LDFLAGS) -o $@ $+ -lz `pkg-config --libs vorbis vorbisenc flac`
compress_scumm_sou$(EXEEXT): compress_scumm_sou.o compress.o util.o
- $(CXX) $(LDFLAGS) -o $@ $+ -lvorbis -logg -lvorbisenc -lFLAC
+ $(CXX) $(LDFLAGS) -o $@ $+ `pkg-config --libs vorbis vorbisenc flac`
compress_sword1$(EXEEXT): compress_sword1.o compress.o util.o
- $(CXX) $(LDFLAGS) -o $@ $+ -lvorbis -logg -lvorbisenc -lFLAC
+ $(CXX) $(LDFLAGS) -o $@ $+ `pkg-config --libs vorbis vorbisenc flac`
compress_sword2$(EXEEXT): compress_sword2.o compress.o util.o
- $(CXX) $(LDFLAGS) -o $@ $+ -lvorbis -logg -lvorbisenc -lFLAC
+ $(CXX) $(LDFLAGS) -o $@ $+ `pkg-config --libs vorbis vorbisenc flac`
compress_tinsel$(EXEEXT): compress_tinsel.o compress.o util.o
- $(CXX) $(LDFLAGS) -o $@ $+ -lvorbis -logg -lvorbisenc -lFLAC
+ $(CXX) $(LDFLAGS) -o $@ $+ `pkg-config --libs vorbis vorbisenc flac`
compress_touche$(EXEEXT): compress_touche.o compress.o util.o
- $(CXX) $(LDFLAGS) -o $@ $+ -lvorbis -logg -lvorbisenc -lFLAC
+ $(CXX) $(LDFLAGS) -o $@ $+ `pkg-config --libs vorbis vorbisenc flac`
compress_tucker$(EXEEXT): compress_tucker.o compress.o util.o
- $(CXX) $(LDFLAGS) -o $@ $+ -lvorbis -logg -lvorbisenc -lFLAC
+ $(CXX) $(LDFLAGS) -o $@ $+ `pkg-config --libs vorbis vorbisenc flac`
decine$(EXEEXT): decine.o
$(CXX) $(LDFLAGS) -o $@ $+
@@ -171,7 +169,7 @@ degob$(EXEEXT): degob.o degob_script.o degob_script_v1
$(CXX) $(LDFLAGS) -o $@ $+
encode_dxa$(EXEEXT): encode_dxa.o compress.o util.o
- $(CXX) $(LDFLAGS) -o $@ $+ -lpng -lz -lvorbis -logg -lvorbisenc -lFLAC
+ $(CXX) $(LDFLAGS) -o $@ $+ `pkg-config --libs libpng vorbis vorbisenc flac`
extract_cine$(EXEEXT): extract_cine.o util.o
$(CXX) $(LDFLAGS) -o $@ $+

13
games/scummvm-tools/patches/patch-configure Normal file
View File

@ -0,0 +1,13 @@
$OpenBSD: patch-configure,v 1.1 2011/05/29 14:05:15 jsg Exp $
--- configure.orig Sun May 29 14:18:48 2011
+++ configure Sun May 29 14:20:00 2011
@@ -338,6 +338,9 @@ EOF
fi
done # for parm in ...
+PNG_CFLAGS=$(pkg-config --cflags libpng)
+PNG_LIBS=$(pkg-config --libs libpng)
+
for ac_option in $@; do
case "$ac_option" in
--enable-vorbis) _vorbis=yes ;;

39
games/scummvm-tools/pkg/PLIST
View File

@ -1,35 +1,18 @@
@comment $OpenBSD: PLIST,v 1.9 2009/12/09 21:55:01 jsg Exp $
@bin bin/compress_agos
@bin bin/compress_gob
@bin bin/compress_kyra
@bin bin/compress_queen
@bin bin/compress_saga
@bin bin/compress_scumm_bun
@bin bin/compress_scumm_san
@bin bin/compress_scumm_sou
@bin bin/compress_sword1
@bin bin/compress_sword2
@bin bin/compress_tinsel
@bin bin/compress_touche
@bin bin/compress_tucker
@comment $OpenBSD: PLIST,v 1.10 2011/05/29 14:05:15 jsg Exp $
@bin bin/construct_mohawk
@bin bin/decine
@bin bin/degob
@bin bin/dekyra
@bin bin/deriven
@bin bin/descumm
@bin bin/desword2
@bin bin/encode_dxa
@bin bin/extract_agos
@bin bin/extract_cine
@bin bin/extract_cruise_pc
@bin bin/extract_gob_stk
@bin bin/extract_kyra
@bin bin/extract_loom_tg16
@bin bin/extract_mm_apple
@bin bin/extract_mm_c64
@bin bin/extract_mm_nes
@bin bin/extract_parallaction
@bin bin/extract_scumm_mac
@bin bin/extract_t7g_mac
@bin bin/extract_zak_c64
@bin bin/extract_mohawk
@bin bin/gob_loadcalc
@bin bin/scummvm-tools
@bin bin/scummvm-tools-cli
share/doc/scummvm-tools/
share/doc/scummvm-tools/README
share/scummvm-tools/
share/scummvm-tools/detaillogo.jpg
share/scummvm-tools/logo.jpg
share/scummvm-tools/tile.gif