Sorry, that was a garbage diff. Please forgive me spamming the list.
New diff attached.
Will
Index: Makefile
===================================================================
RCS file: /cvs/ports/games/love/Makefile,v
retrieving revision 1.27
diff -u -p -r1.27 Makefile
--- Makefile 14 May 2020 12:35:31 -0000 1.27
+++ Makefile 19 Feb 2021 21:58:21 -0000
@@ -2,7 +2,7 @@
COMMENT= 2D games framework for use with Lua
-V= 0.8.0
+V= 11.3
DISTNAME= love-$V-linux-src
PKGNAME= love-$V
REVISION= 12
@@ -16,17 +16,17 @@ CATEGORIES= games lang/lua
PERMIT_PACKAGE= Yes
WANTLIB += ${MODLUA_WANTLIB}
-WANTLIB += ${COMPILER_LIBCXX} GL Half-2_5 IL Iex-2_5 IexMath-2_5
-WANTLIB += IlmImf-2_5 IlmThread-2_5 Imath-2_5 SDL X11 X11-xcb
-WANTLIB += Xdamage Xext Xfixes Xxf86vm c drm expat freetype glapi
-WANTLIB += iconv jasper jpeg lcms m mng modplug mpg123 ogg openal
-WANTLIB += physfs png sndio tiff usbhid vorbis vorbisfile xcb
-WANTLIB += xcb-dri2 xcb-dri3 xcb-glx xcb-present xcb-sync xcb-xfixes
-WANTLIB += xshmfence z
+WANTLIB += ${COMPILER_LIBCXX}
+WANTLIB += X11
+WANTLIB += Xext Xfixes Xxf86vm c freetype
+WANTLIB += m modplug mpg123 ogg openal
+WANTLIB += z sndio usbhid vorbis vorbisfile xcb
+WANTLIB += Xcursor Xi Xinerama Xrandr Xrender Xss
+WANTLIB += SDL2 luajit-5.1 samplerate theoradec
COMPILER = base-clang ports-gcc base-gcc
-MASTER_SITES= https://bitbucket.org/rude/love/downloads/
+MASTER_SITES= https://github.com/love2d/love/releases/download/11.3/
MODULES= lang/lua
@@ -34,18 +34,22 @@ LIB_DEPENDS= audio/libmodplug \
audio/mpg123 \
audio/openal \
audio/libvorbis \
- converters/libiconv \
- devel/physfs \
- devel/sdl \
- graphics/DevIL \
- graphics/openexr \
+ devel/sdl2 \
+ lang/luajit \
+ multimedia/libtheora \
${MODLUA_LIB_DEPENDS}
+RUN_DEPENDS+= x11/gtk+3,-guic \
+ devel/desktop-file-utils \
+ misc/shared-mime-info
+
CONFIGURE_STYLE= gnu
+# configure script attempts to link with g++ hence OBJCXX
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include
-I${LOCALBASE}/include/SDL/ \
-I${X11BASE}/include/
-I${X11BASE}/include/freetype2 \
`pkg-config --cflags ${MODLUA_DEP}`" \
- LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib -pthread"
+ LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib -pthread" \
+ OBJCXX="c++"
WRKDIST= ${WRKDIR}/love-$V
Index: distinfo
===================================================================
RCS file: /cvs/ports/games/love/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- distinfo 18 Jan 2015 03:14:00 -0000 1.3
+++ distinfo 19 Feb 2021 21:58:21 -0000
@@ -1,2 +1,2 @@
-SHA256 (love-0.8.0-linux-src.tar.gz) =
kWfKHMeJP/H9zztvx+Koi+ENiZB1pROUJCD+j5Rmjsw=
-SIZE (love-0.8.0-linux-src.tar.gz) = 1027356
+SHA256 (love-11.3-linux-src.tar.gz) =
649f0db7750ca121e4de7b60208703661052356df35f4cfad490b1ba14dd1455
+SIZE (love-11.3-linux-src.tar.gz) = 2898851
Index: patches/patch-configure
===================================================================
RCS file: /cvs/ports/games/love/patches/patch-configure,v
retrieving revision 1.2
diff -u -p -r1.2 patch-configure
--- patches/patch-configure 11 May 2012 21:38:29 -0000 1.2
+++ patches/patch-configure 19 Feb 2021 21:58:21 -0000
@@ -1,21 +1,22 @@
$OpenBSD: patch-configure,v 1.2 2012/05/11 21:38:29 jasper Exp $
---- configure.orig Fri Apr 6 20:17:02 2012
-+++ configure Fri May 11 11:55:53 2012
-@@ -16443,7 +16443,7 @@ for ac_lib in '' vorbisfile; do
+Index: configure
+--- configure.orig
++++ configure
+@@ -20393,7 +20393,7 @@ for ac_lib in '' mpg123; do
ac_res="none required"
else
ac_res=-l$ac_lib
- LIBS="-l$ac_lib $ac_func_search_save_LIBS"
+ LIBS="-l$ac_lib -lvorbis -lm -logg $ac_func_search_save_LIBS"
fi
- if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_search_ov_open=$ac_res
-@@ -16460,7 +16460,7 @@ else
- ac_cv_search_ov_open=no
+ if ac_fn_cxx_try_link "$LINENO"; then :
+ ac_cv_search_mpg123_seek_64=$ac_res
+@@ -20410,7 +20410,7 @@ else
+ ac_cv_search_mpg123_seek_64=no
fi
rm conftest.$ac_ext
-LIBS=$ac_func_search_save_LIBS
+LIBS="$ac_func_search_save_LIBS -lvorbis -lm -logg"
fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_ov_open" >&5
- $as_echo "$ac_cv_search_ov_open" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result:
$ac_cv_search_mpg123_seek_64" >&5
+ $as_echo "$ac_cv_search_mpg123_seek_64" >&6; }
Index: patches/patch-src_libraries_Box2D_Collision_Shapes_b2ChainShape_h
===================================================================
RCS file:
/cvs/ports/games/love/patches/patch-src_libraries_Box2D_Collision_Shapes_b2ChainShape_h,v
retrieving revision 1.1
diff -u -p -r1.1 patch-src_libraries_Box2D_Collision_Shapes_b2ChainShape_h
--- patches/patch-src_libraries_Box2D_Collision_Shapes_b2ChainShape_h 18 Oct
2019 15:11:09 -0000 1.1
+++ patches/patch-src_libraries_Box2D_Collision_Shapes_b2ChainShape_h 19 Feb
2021 21:58:21 -0000
@@ -6,14 +6,14 @@ error: converting to 'bool' from 'std::n
Index: src/libraries/Box2D/Collision/Shapes/b2ChainShape.h
--- src/libraries/Box2D/Collision/Shapes/b2ChainShape.h.orig
+++ src/libraries/Box2D/Collision/Shapes/b2ChainShape.h
-@@ -95,8 +95,8 @@ inline b2ChainShape::b2ChainShape()
+@@ -98,8 +98,8 @@ inline b2ChainShape::b2ChainShape()
m_radius = b2_polygonRadius;
m_vertices = NULL;
m_count = 0;
-- m_hasPrevVertex = NULL;
-- m_hasNextVertex = NULL;
-+ m_hasPrevVertex = false;
-+ m_hasNextVertex = false;
+- m_hasPrevVertex = false;
+- m_hasNextVertex = false;
++ m_hasPrevVertex = NULL;
++ m_hasNextVertex = NULL;
}
#endif
Index: patches/patch-src_libraries_glslang_glslang_Include_PoolAlloc_h
===================================================================
RCS file: patches/patch-src_libraries_glslang_glslang_Include_PoolAlloc_h
diff -N patches/patch-src_libraries_glslang_glslang_Include_PoolAlloc_h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_libraries_glslang_glslang_Include_PoolAlloc_h 19 Feb
2021 21:58:21 -0000
@@ -0,0 +1,13 @@
+$OpenBSD$
+
+Index: src/libraries/glslang/glslang/Include/PoolAlloc.h
+--- src/libraries/glslang/glslang/Include/PoolAlloc.h.orig
++++ src/libraries/glslang/glslang/Include/PoolAlloc.h
+@@ -304,7 +304,6 @@ class pool_allocator { (public)
+ size_type max_size() const { return static_cast<size_type>(-1) /
sizeof(T); }
+ size_type max_size(int size) const { return static_cast<size_type>(-1) /
size; }
+
+- void setAllocator(TPoolAllocator* a) { allocator = *a; }
+ TPoolAllocator& getAllocator() const { return allocator; }
+
+ protected:
Index: patches/patch-src_modules_font_freetype_Font_h
===================================================================
RCS file: patches/patch-src_modules_font_freetype_Font_h
diff -N patches/patch-src_modules_font_freetype_Font_h
--- patches/patch-src_modules_font_freetype_Font_h 9 Jan 2014 16:48:47
-0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,16 +0,0 @@
-$OpenBSD: patch-src_modules_font_freetype_Font_h,v 1.1 2014/01/09 16:48:47
naddy Exp $
---- src/modules/font/freetype/Font.h.orig Fri Apr 6 20:15:01 2012
-+++ src/modules/font/freetype/Font.h Thu Jan 9 17:09:36 2014
-@@ -30,10 +30,8 @@
- #else
- #include <ft2build.h>
- #endif
--#include <freetype/freetype.h>
--#include <freetype/ftglyph.h>
--#include <freetype/ftoutln.h>
--#include <freetype/fttrigon.h>
-+#include FT_FREETYPE_H
-+#include FT_GLYPH_H
-
- namespace love
- {
Index: patches/patch-src_modules_font_freetype_TrueTypeRasterizer_h
===================================================================
RCS file:
/cvs/ports/games/love/patches/patch-src_modules_font_freetype_TrueTypeRasterizer_h,v
retrieving revision 1.1
diff -u -p -r1.1 patch-src_modules_font_freetype_TrueTypeRasterizer_h
--- patches/patch-src_modules_font_freetype_TrueTypeRasterizer_h 9 Jan
2014 16:48:47 -0000 1.1
+++ patches/patch-src_modules_font_freetype_TrueTypeRasterizer_h 19 Feb
2021 21:58:21 -0000
@@ -1,16 +1,17 @@
$OpenBSD: patch-src_modules_font_freetype_TrueTypeRasterizer_h,v 1.1
2014/01/09 16:48:47 naddy Exp $
---- src/modules/font/freetype/TrueTypeRasterizer.h.orig Fri Apr 6
20:15:01 2012
-+++ src/modules/font/freetype/TrueTypeRasterizer.h Thu Jan 9 17:14:48 2014
-@@ -27,10 +27,8 @@
+Index: src/modules/font/freetype/TrueTypeRasterizer.h
+--- src/modules/font/freetype/TrueTypeRasterizer.h.orig
++++ src/modules/font/freetype/TrueTypeRasterizer.h
+@@ -27,8 +27,10 @@
- // TrueType2
+ // FreeType2
#include <ft2build.h>
--#include <freetype/freetype.h>
--#include <freetype/ftglyph.h>
--#include <freetype/ftoutln.h>
--#include <freetype/fttrigon.h>
-+#include FT_FREETYPE_H
-+#include FT_GLYPH_H
+-#include FT_FREETYPE_H
+-#include FT_GLYPH_H
++#include <freetype/freetype.h>
++#include <freetype/ftglyph.h>
++#include <freetype/ftoutln.h>
++#include <freetype/fttrigon.h>
namespace love
{
Index: patches/patch-src_modules_graphics_opengl_GLee_h
===================================================================
RCS file: patches/patch-src_modules_graphics_opengl_GLee_h
diff -N patches/patch-src_modules_graphics_opengl_GLee_h
--- patches/patch-src_modules_graphics_opengl_GLee_h 31 Jan 2019 14:49:50
-0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,29 +0,0 @@
-$OpenBSD: patch-src_modules_graphics_opengl_GLee_h,v 1.2 2019/01/31 14:49:50
naddy Exp $
-
-Mesa >= 18.2.5 has newer OpenGL headers from Khronos which change the
-include guards.
-
-Prevent redefining __GLXextFuncPtr.
-
-Index: src/modules/graphics/opengl/GLee.h
---- src/modules/graphics/opengl/GLee.h.orig
-+++ src/modules/graphics/opengl/GLee.h
-@@ -63,7 +63,9 @@
- #include <OpenGL/gl.h>
- #else // GLX
- #define __glext_h_ /* prevent glext.h from being included */
-+ #define __gl_glext_h_ /* prevent glext.h from being included */
- #define __glxext_h_ /* prevent glxext.h from being included */
-+ #define __glx_glxext_h_ /* prevent glxext.h from being included */
- #define GLX_GLXEXT_PROTOTYPES
- #include <GL/gl.h>
- #include <GL/glx.h>
-@@ -798,8 +800,6 @@ GLEE_EXTERN GLboolean _GLEE_SGIX_texture_range;
- #else
-
- /* GLX */
--
-- typedef void (*__GLXextFuncPtr)(void);
-
- #ifndef GLX_ARB_get_proc_address
- #define GLX_ARB_get_proc_address 1
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/games/love/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- pkg/PLIST 2 Jul 2011 09:54:39 -0000 1.1.1.1
+++ pkg/PLIST 19 Feb 2021 21:58:21 -0000
@@ -1,2 +1,15 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2011/07/02 09:54:39 jasper Exp $
@bin bin/love
+@so lib/liblove-11.3.so
+@static-lib lib/liblove.a
+lib/liblove.la
+@so lib/liblove.so
+@man man/man1/love.1
+share/applications/love.desktop
+share/icons/hicolor/scalable/mimetypes/application-x-love-game.svg
+share/mime/packages/love.xml
+share/pixmaps/
+share/pixmaps/love.svg
+@tag update-desktop-database
+@tag gtk-update-icon-cache %D/share/icons/hicolor
+@tag update-mime-database
