Index: branches/2017Q4/games/opensurge/Makefile =================================================================== --- branches/2017Q4/games/opensurge/Makefile (revision 455753) +++ branches/2017Q4/games/opensurge/Makefile (revision 455754) @@ -1,84 +1,85 @@ # Created by: Rusmir Dusko # $FreeBSD$ PORTNAME= opensurge PORTVERSION= 0.1.r${SVN_REV} PORTREVISION= 4 CATEGORIES= games MASTER_SITES= http://www.ime.usp.br/~alemart/opensurge_nightly/ \ SF/nemysisfreebsdp/${CATEGORIES}/${PORTNAME}/ DISTFILES= ${PORTNAME}-src-build${SVN_REV}${EXTRACT_SUFX} \ ${PORTNAME}-mods-${MODS_VER}${EXTRACT_SUFX} MAINTAINER= nemysis@FreeBSD.org COMMENT= Game based on the Sonic the Hedgehog universe DEPRECATED= Depends on expired and unfetchable x11-fonts/alfont EXPIRATION_DATE=2017-11-01 LICENSE= GPLv2+ CC-BY-SA-3.0 LICENSE_COMB= multi LICENSE_FILE_GPLv2+ = ${WRKSRC}/licenses/GPLv2.txt LICENSE_FILE_CC-BY-SA-3.0= ${WRKSRC}/licenses/CC-BY-SA-3.0.txt BUILD_DEPENDS= ${LOCALBASE}/lib/libaldmb.a:audio/dumb-allegro \ ${LOCALBASE}/include/alfont.h:x11-fonts/alfont \ alureplay:audio/alure -LIB_DEPENDS= liballeg.so:devel/allegro \ +LIB_DEPENDS= libalfont.so:x11-fonts/alfont \ + liballeg.so:devel/allegro \ libogg.so:audio/libogg \ libvorbis.so:audio/libvorbis RUN_DEPENDS= ${LOCALBASE}/lib/libaldmb.a:audio/dumb-allegro WRKSRC= ${WRKDIR}/${PORTNAME}-src-build${SVN_REV} USES= cmake dos2unix openal:soft DOS2UNIX_GLOB= *.bg *.brk *.grp *.inc *.lev *.lng *.obj *.qst *.spr *.txt USE_GCC= yes PORTDOCS= readme.html PORTDATA= * OPTIONS_DEFINE= DOCS SUB_FILES= ${PORTNAME} pkg-deinstall pkg-message INSTALLS_ICONS= yes ICON_SIZES= 16x16 32x32 48x48 64x64 72x72 96x96 128x128 256x256 DESKTOP_ENTRIES="Open Surge" "" "${PORTNAME}" \ "${PORTNAME}" "Game;ArcadeGame;" "" .include "Makefile.svn_rev" post-extract-script: @(cd ${WRKDIR}/opensurge-mods && ${COPYTREE_SHARE} . ${WRKSRC}) post-patch: @${REINPLACE_CMD} -e 's|/usr/share/opensurge|${DATADIR}|' \ -e 's|/usr/bin|${PREFIX}/bin|' \ ${WRKSRC}/src/core/global.h @${REINPLACE_CMD} -e 's|/usr/bin|${PREFIX}/bin|' \ ${WRKSRC}/src/core/osspec.c @${REINPLACE_CMD} -e 's|/usr/share|${PREFIX}/share|; \ s|/usr/bin|${PREFIX}/bin|; \ s|license.txt readme.html||; \ s|licenses||' \ ${WRKSRC}/CMakeLists.txt @${REINPLACE_CMD} -i '' '/Copying executable to/,+2d' \ ${WRKSRC}/CMakeLists.txt post-install: ${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/ .for s in ${ICON_SIZES} @${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/${s}/apps/ @${INSTALL_DATA} ${WRKSRC}/src/misc/${PORTNAME}_${s}.png \ ${STAGEDIR}${PREFIX}/share/icons/hicolor/${s}/apps/${PORTNAME}.png .endfor ${LN} -sf ${PREFIX}/share/icons/hicolor/48x48/apps/${PORTNAME}.png \ ${STAGEDIR}${PREFIX}/share/pixmaps/ @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} .include Index: branches/2017Q4/games/opensurge/files/patch-src_core_image.c =================================================================== --- branches/2017Q4/games/opensurge/files/patch-src_core_image.c (nonexistent) +++ branches/2017Q4/games/opensurge/files/patch-src_core_image.c (revision 455754) @@ -0,0 +1,41 @@ +--- src/core/image.c.orig 2017-11-14 12:17:25 UTC ++++ src/core/image.c +@@ -34,12 +34,6 @@ + #include "resourcemanager.h" + #include "util.h" + +-/* image structure */ +-struct image_t { +- BITMAP *data; /* this must be the first field */ +- int w, h; +-}; +- + /* useful stuff */ + #define IS_PNG(path) (str_icmp((path)+strlen(path)-4, ".png") == 0) + typedef int (*fast_getpixel_funptr)(BITMAP*,int,int); +@@ -233,25 +227,6 @@ image_t *image_create_shared(const image + return img; + } + +-/* +- * image_width() +- * The width of the image +- */ +-inline int image_width(const image_t *img) +-{ +- return img->w; +-} +- +- +-/* +- * image_height() +- * The height of the image +- */ +-inline int image_height(const image_t *img) +-{ +- return img->h; +-} +- + + /* + * image_getpixel() Property changes on: branches/2017Q4/games/opensurge/files/patch-src_core_image.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2017Q4/games/opensurge/files/patch-src_core_image.h =================================================================== --- branches/2017Q4/games/opensurge/files/patch-src_core_image.h (nonexistent) +++ branches/2017Q4/games/opensurge/files/patch-src_core_image.h (revision 455754) @@ -0,0 +1,51 @@ +--- src/core/image.h.orig 2017-11-14 12:16:37 UTC ++++ src/core/image.h +@@ -22,10 +22,15 @@ + #ifndef _IMAGE_H + #define _IMAGE_H + ++#include "allegro.h" + #include "global.h" + #include "v2d.h" + +-/* opaque image type */ ++/* image structure */ ++struct image_t { ++ BITMAP *data; /* this must be the first field */ ++ int w, h; ++}; + typedef struct image_t image_t; + + /* image flags (bitwise OR) */ +@@ -42,13 +47,29 @@ void image_save(const image_t *img, cons + image_t *image_create_shared(const image_t *parent, int x, int y, int width, int height); /* creates a sub-image */ + + /* properties */ +-inline int image_width(const image_t *img); +-inline int image_height(const image_t *img); + uint32 image_rgb(uint8 r, uint8 g, uint8 b); + void image_color2rgb(uint32 color, uint8 *r, uint8 *g, uint8 *b); + int image_pixelperfect_collision(const image_t *img1, const image_t *img2, int x1, int y1, int x2, int y2); + uint32 image_getpixel(const image_t *img, int x, int y); + ++/* ++ * image_width() ++ * The width of the image ++ */ ++inline int image_width(const image_t *img) ++{ ++ return img->w; ++} ++ ++/* ++ * image_height() ++ * The height of the image ++ */ ++inline int image_height(const image_t *img) ++{ ++ return img->h; ++} ++ + /* drawing primitives */ + void image_clear(image_t *img, uint32 color); + void image_putpixel(image_t *img, int x, int y, uint32 color); Property changes on: branches/2017Q4/games/opensurge/files/patch-src_core_image.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2017Q4 =================================================================== --- branches/2017Q4 (revision 455753) +++ branches/2017Q4 (revision 455754) Property changes on: branches/2017Q4 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r455615