Date: Sat, 5 Oct 2013 10:49:13 +0000 (UTC) From: William Grzybowski <wg@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r329437 - in head/emulators/visualboyadvance-m: . files Message-ID: <201310051049.r95AnDU7016263@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: wg Date: Sat Oct 5 10:49:12 2013 New Revision: 329437 URL: http://svnweb.freebsd.org/changeset/ports/329437 Log: emulators/visualboyadvance-m: fix build - Fix build [1] - Convert lib depends to new format - Allow staging PR: ports/181413 [1] Submitted by: David Demelier <demelier.david gmail.com> (maintainer) [1] Added: head/emulators/visualboyadvance-m/files/patch-fex-fex-Data_Reader.cpp (contents, props changed) head/emulators/visualboyadvance-m/files/patch-src-Util.cpp (contents, props changed) Modified: head/emulators/visualboyadvance-m/Makefile head/emulators/visualboyadvance-m/pkg-plist Modified: head/emulators/visualboyadvance-m/Makefile ============================================================================== --- head/emulators/visualboyadvance-m/Makefile Sat Oct 5 10:26:30 2013 (r329436) +++ head/emulators/visualboyadvance-m/Makefile Sat Oct 5 10:49:12 2013 (r329437) @@ -10,15 +10,18 @@ MASTER_SITES= http://update.cooltrainer. MAINTAINER= root@cooltrainer.org COMMENT= Game Boy Advance emulator with GTK frontend -LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \ - cairomm-1.0.1:${PORTSDIR}/graphics/cairomm \ - sfml-system.1:${PORTSDIR}/devel/sfml +LIB_DEPENDS= libpng15.so:${PORTSDIR}/graphics/png \ + libcairomm-1.0.so:${PORTSDIR}/graphics/cairomm \ + libsfml-system.so:${PORTSDIR}/devel/sfml OPTIONS_DEFINE= GVBAM NLS OPTIONS_DEFAULT= GVBAM OPTIONS_DEFINE_i386= ASM +OPTIONS_SUB= yes GVBAM_DESC= Build gvbam (GTK2 frontend) +NLS_USES= gettext + USE_BZIP2= yes WANT_GNOME= yes USE_DOS2UNIX= yes @@ -26,11 +29,10 @@ DOS2UNIX_REGEX= .*\.(c|cpp|h) USE_XORG= x11 xext USE_GL= gl glu USE_SDL= sdl -USES= cmake pkgconfig +USES= cmake desktop-file-utils pkgconfig CMAKE_ARGS+= -DVERSION:STRING="${PORTVERSION}" -DSYSCONFDIR:STRING="${PREFIX}/etc" SVN_REV= 1001 -NO_STAGE= yes .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MASM} @@ -39,36 +41,25 @@ CMAKE_ARGS+= -DENABLE_ASM_CORE:BOOL=yes .endif .if ${PORT_OPTIONS:MGVBAM} -PLIST_SUB+= GVBAM="" USE_GNOME= gtk20 -LIB_DEPENDS+= gtkmm-2.4:${PORTSDIR}/x11-toolkits/gtkmm24 \ - glibmm-2.4:${PORTSDIR}/devel/glibmm \ - giomm-2.4:${PORTSDIR}/devel/glibmm \ - glademm-2.4:${PORTSDIR}/devel/libglademm24 \ - gdkglextmm-x11-1.2:${PORTSDIR}/x11-toolkits/gtkglextmm +LIB_DEPENDS+= libgtkmm-2.4.so:${PORTSDIR}/x11-toolkits/gtkmm24 \ + libglibmm-2.4.so:${PORTSDIR}/devel/glibmm \ + libgiomm-2.4.so:${PORTSDIR}/devel/glibmm \ + libglademm-2.4.so:${PORTSDIR}/devel/libglademm24 \ + libgdkglextmm-x11-1.2.so:${PORTSDIR}/x11-toolkits/gtkglextmm .else -PLIST_SUB+= GVBAM="@comment " CMAKE_ARGS+= -DENABLE_GTK:BOOL=no .endif .if ${PORT_OPTIONS:MNLS} -USES+= gettext CMAKE_ARGS+= -DENABLE_NLS:BOOL=yes -PLIST_SUB+= NLS="" .else CMAKE_ARGS+= -DENABLE_NLS:BOOL=no -PLIST_SUB+= NLS="@comment " .endif post-patch: @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' ${WRKSRC}/CMakeScripts/FindSFML.cmake -post-install: - -@update-desktop-database - @if [ ! -f ${PREFIX}/etc/vbam.cfg ]; then \ - ${CP} -p ${PREFIX}/etc/vbam.cfg-example ${PREFIX}/etc/vbam.cfg ; \ - fi - maint-gen-distfile: @if [ -f ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} ]; then \ ${ECHO_CMD} "ERROR: the distfile already exists."; \ Added: head/emulators/visualboyadvance-m/files/patch-fex-fex-Data_Reader.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/emulators/visualboyadvance-m/files/patch-fex-fex-Data_Reader.cpp Sat Oct 5 10:49:12 2013 (r329437) @@ -0,0 +1,36 @@ +--- fex/fex/Data_Reader.cpp.orig 2013-10-05 07:19:22.649937270 -0300 ++++ fex/fex/Data_Reader.cpp 2013-10-05 07:20:36.384931508 -0300 +@@ -732,11 +732,11 @@ + + blargg_err_t Gzip_File_Reader::read_v( void* p, int s ) + { +- int result = gzread( file_, p, s ); ++ int result = gzread( static_cast<gzFile_s *>(file_), p, s ); + if ( result != s ) + { + if ( result < 0 ) +- return convert_gz_error( file_ ); ++ return convert_gz_error( static_cast<gzFile_s *>(file_) ); + + return blargg_err_file_corrupt; + } +@@ -746,8 +746,8 @@ + + blargg_err_t Gzip_File_Reader::seek_v( int n ) + { +- if ( gzseek( file_, n, SEEK_SET ) < 0 ) +- return convert_gz_error( file_ ); ++ if ( gzseek( static_cast<gzFile_s *>(file_), n, SEEK_SET ) < 0 ) ++ return convert_gz_error( static_cast<gzFile_s *>(file_) ); + + return blargg_ok; + } +@@ -756,7 +756,7 @@ + { + if ( file_ ) + { +- if ( gzclose( file_ ) ) ++ if ( gzclose( static_cast<gzFile_s *>(file_) ) ) + check( false ); + file_ = NULL; + } Added: head/emulators/visualboyadvance-m/files/patch-src-Util.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/emulators/visualboyadvance-m/files/patch-src-Util.cpp Sat Oct 5 10:49:12 2013 (r329437) @@ -0,0 +1,11 @@ +--- src/Util.cpp.orig 2013-10-05 07:22:08.455933950 -0300 ++++ src/Util.cpp 2013-10-05 07:22:40.675934470 -0300 +@@ -544,7 +544,7 @@ + + gzFile utilGzOpen(const char *file, const char *mode) + { +- utilGzWriteFunc = (int (ZEXPORT *)(void *,void * const, unsigned int))gzwrite; ++ utilGzWriteFunc = (int (ZEXPORT *)(gzFile_s *,void * const, unsigned int))gzwrite; + utilGzReadFunc = gzread; + utilGzCloseFunc = gzclose; + utilGzSeekFunc = gzseek; Modified: head/emulators/visualboyadvance-m/pkg-plist ============================================================================== --- head/emulators/visualboyadvance-m/pkg-plist Sat Oct 5 10:26:30 2013 (r329436) +++ head/emulators/visualboyadvance-m/pkg-plist Sat Oct 5 10:49:12 2013 (r329437) @@ -35,5 +35,3 @@ etc/vbam.cfg-example %%GVBAM%%@dirrm share/icons/hicolor %%GVBAM%%@dirrm share/icons %%GVBAM%%@dirrm share/applications -%%GVBAM%%@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true -%%GVBAM%%@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310051049.r95AnDU7016263>