Re: Update games/love to 11.3
> Hi, it compiles for me but haven't found a game that works with it.
> I guess it's too new.
The done thing in distributing love games seems to be to just require a
particular version, or nowadays stick it all in an AppImage for Linux. I
don't know if it's feasible to maintain every major version though, or
if that's even desirable, but that means some games won't be playable
without modifications.
> Multi version package (seperate port) seems the way to go,
> but it's non-trivial. Must not clash with v0.8
> See for example lang/lua/{5.1,5.2,5.3}
Thanks, I'll take a look. This might be a little over my head, but I'll
give it a try!
> I'm the one who told you to test OBJCXX=c++
> Seems the standard way would be to use
> OBJCXX="${CXX}" in the Makefile
Thanks for your help! You're 100% correct, I'll change that.
Will
Re: Update games/love to 11.3
On Sat, 20 Feb 2021 09:49:11 +
"Will Luckin" wrote:
> > Have you tested love2d games that use pre-11.3 with this update? I have
> > looked at love2d updates previously and they were _not_ backwards
> > compatible. My impression was that this ports needs a multi-version
> > approach to not break applications that rely on the old version.
> > However, I haven't found an opportunity to implement this yet.
>
> There are breaking changes with every love major release, I think, so
> games written for 0.8 would need updating to work with 0.11.3. I didn't
> realise this would be a problem because OpenBSD doesn't have any other
> but 0.8 packaged currently.
>
> 0.8 is quite old, from 2012, and missing a lot of new additions to love
> so 0.11.3 is definitely preferable for new users.
>
> Do you think it would be wise to create a seperate port?
>
Hi, it compiles for me but haven't found a game that works with it.
I guess it's too new.
Multi version package (seperate port) seems the way to go,
but it's non-trivial. Must not clash with v0.8
See for example lang/lua/{5.1,5.2,5.3}
I'm the one who told you to test OBJCXX=c++
Seems the standard way would be to use
OBJCXX="${CXX}" in the Makefile
Greetings Ben
Re: Update games/love to 11.3
> Have you tested love2d games that use pre-11.3 with this update? I have > looked at love2d updates previously and they were _not_ backwards > compatible. My impression was that this ports needs a multi-version > approach to not break applications that rely on the old version. > However, I haven't found an opportunity to implement this yet. There are breaking changes with every love major release, I think, so games written for 0.8 would need updating to work with 0.11.3. I didn't realise this would be a problem because OpenBSD doesn't have any other but 0.8 packaged currently. 0.8 is quite old, from 2012, and missing a lot of new additions to love so 0.11.3 is definitely preferable for new users. Do you think it would be wise to create a seperate port?
Re: Update games/love to 11.3
On Fri, Feb 19, 2021 at 09:58:54PM +, Will Luckin wrote:
> 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 - 1.27
> +++ Makefile 19 Feb 2021 21:58:21 -
> @@ -2,7 +2,7 @@
>
> COMMENT= 2D games framework for use with Lua
>
> -V= 0.8.0
> +V= 11.3
Have you tested love2d games that use pre-11.3 with this update? I have
looked at love2d updates previously and they were _not_ backwards
compatible. My impression was that this ports needs a multi-version
approach to not break applications that rely on the old version.
However, I haven't found an opportunity to implement this yet.
> 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 - 1.3
> +++ distinfo 19 Feb 2021 21:58:21 -
> @@ -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 - 1.2
> +++ patches/patch-configure 19 Feb 2021 21:58:21 -
> @@ -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
> -+++ configureFri 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 a
Re: Update games/love to 11.3
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
--- Makefile14 May 2020 12:35:31 - 1.27
+++ Makefile19 Feb 2021 21:58:21 -
@@ -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
--- distinfo18 Jan 2015 03:14:00 - 1.3
+++ distinfo19 Feb 2021 21:58:21 -
@@ -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 - 1.2
+++ patches/patch-configure 19 Feb 2021 21:58:21 -
@@ -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"
Re: Update games/love to 11.3
On the advice of solene@, I'm attaching a diff here instead of requiring
people to download the tarball.
Will
? patches/patch-src_libraries_glslang_glslang_Include_PoolAlloc_h
Index: Makefile
===
RCS file: /cvs/ports/games/love/Makefile,v
retrieving revision 1.27
diff -u -p -r1.27 Makefile
--- Makefile14 May 2020 12:35:31 - 1.27
+++ Makefile19 Feb 2021 21:46:53 -
@@ -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
--- distinfo18 Jan 2015 03:14:00 - 1.3
+++ distinfo19 Feb 2021 21:46:53 -
@@ -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 - 1.2
+++ patches/patch-configure 19 Feb 2021 21:46:53 -
@@ -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; }
Update games/love to 11.3
Hello ports, I've updated the games/love port to the latest upstream version 11.3. It's available at https://www.luckin.co.uk/share/love.tar.gz. I've tested it on amd64. Would love others to test/give feedback, as this is my first attempt at submitting a port to OpenBSD. Thanks, Will
