svn commit: r455754 - in branches/2017Q4/games/opensurge: . files

[Rene Ladan]

Author: rene
Date: Thu Dec  7 20:52:07 2017
New Revision: 455754
URL: https://svnweb.freebsd.org/changeset/ports/455754

Log:
  MFH: r455615
  
  games/opensurge: unbreak and unexpire [1]
  
  Add LIB_DEPENDS on x11-fonts/alfont
  
  PR:		223746
  Submitted by:	timon at timon.net.nz
  Approved by:	maintainer timeout (nemysis, 15 days)
  
  Approved by:	ports-secteam (build-fix blanket)

Added:
  branches/2017Q4/games/opensurge/files/patch-src_core_image.c
     - copied unchanged from r455615, head/games/opensurge/files/patch-src_core_image.c
  branches/2017Q4/games/opensurge/files/patch-src_core_image.h
     - copied unchanged from r455615, head/games/opensurge/files/patch-src_core_image.h
Modified:
  branches/2017Q4/games/opensurge/Makefile
Directory Properties:
  branches/2017Q4/   (props changed)

Modified: branches/2017Q4/games/opensurge/Makefile
==============================================================================
--- branches/2017Q4/games/opensurge/Makefile	Thu Dec  7 20:03:29 2017	(r455753)
+++ branches/2017Q4/games/opensurge/Makefile	Thu Dec  7 20:52:07 2017	(r455754)
@@ -24,7 +24,8 @@ LICENSE_FILE_CC-BY-SA-3.0=	${WRKSRC}/licenses/CC-BY-SA
 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

Copied: branches/2017Q4/games/opensurge/files/patch-src_core_image.c (from r455615, head/games/opensurge/files/patch-src_core_image.c)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2017Q4/games/opensurge/files/patch-src_core_image.c	Thu Dec  7 20:52:07 2017	(r455754, copy of r455615, head/games/opensurge/files/patch-src_core_image.c)
@@ -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()

Copied: branches/2017Q4/games/opensurge/files/patch-src_core_image.h (from r455615, head/games/opensurge/files/patch-src_core_image.h)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2017Q4/games/opensurge/files/patch-src_core_image.h	Thu Dec  7 20:52:07 2017	(r455754, copy of r455615, head/games/opensurge/files/patch-src_core_image.h)
@@ -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);