pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

0ad: builds, last problems: runtime path

Module Name:	pkgsrc-wip
Committed By:	nikita <nikita%NetBSD.org@localhost>
Pushed By:	nikita
Date:		Thu May 4 10:33:52 2023 +0200
Changeset:	6b3c93833f63747664d126a007aea79baad7cc88

Modified Files:
	0ad/Makefile
	0ad/PLIST
	0ad/TODO
	0ad/options.mk

Log Message:
0ad: builds, last problems: runtime path

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=6b3c93833f63747664d126a007aea79baad7cc88

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 0ad/Makefile   | 20 +++++++++-----------
 0ad/PLIST      | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 0ad/TODO       | 50 ++++++++++++++++++++++++++++----------------------
 0ad/options.mk |  2 +-
 4 files changed, 90 insertions(+), 34 deletions(-)

diffs:
diff --git a/0ad/Makefile b/0ad/Makefile
index a505937e8d..c6aee0ff2a 100644
--- a/0ad/Makefile
+++ b/0ad/Makefile
@@ -18,6 +18,7 @@ USE_TOOLS+=	gmake perl bash pkg-config pax tar cmake
 
 PYTHON_VERSIONS_INCOMPATIBLE=	27
 
+# TODO: maybe move into extra distfile instead of separate package?
 DEPENDS+=		0ad-data-${PKGVERSION}:../../wip/0ad-data
 BUILD_DEPENDS+=		premake5-[0-9]*:../../devel/premake5
 BUILD_DEPENDS+=		zip-[0-9]*:../../archivers/zip
@@ -85,12 +86,12 @@ do-build:
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/binaries/system/pyrogenesis ${DESTDIR}${PREFIX}/bin
 	${INSTALL_SCRIPT} ${WRKSRC}/build/resources/0ad.sh ${DESTDIR}${PREFIX}/bin/0ad
-.if ${PKG_OPTIONS:Meditor}
+.if !empty(PKG_OPTIONS:Meditor)
 	${INSTALL_PROGRAM} ${WRKSRC}/binaries/system/ActorEditor ${DESTDIR}${PREFIX}/bin
 	cd ${WRKSRC}/binaries/system && ${INSTALL_LIB} libAtlasUI.a ${DESTDIR}${PREFIX}/lib/${PKGBASE}
 .endif
 	# TODO: all of these should be .so.
-	cd ${WRKSRC}/binaries/system && ${INSTALL_LIB} libatlas.a libAtlasUI.a \
+	cd ${WRKSRC}/binaries/system && ${INSTALL_LIB} libatlas.a \
 		libengine.a libgladwrapper.a libglooxwrapper.a libgraphics.a \
 		libgui.a liblobby.a liblowlevel.a libmocks_real.a libmocks_test.a \
 		libmongoose.a libnetwork.a librlinterface.a libscriptinterface.a \
@@ -99,17 +100,15 @@ do-install:
 		${DESTDIR}${PREFIX}/lib/${PKGBASE}
 	${INSTALL_DATA} ${WRKSRC}/build/resources/0ad.desktop ${DESTDIR}${PREFIX}/share/applications
 	${INSTALL_DATA} ${WRKSRC}/build/resources/0ad.png ${DESTDIR}${PREFIX}/share/pixmaps
-.for d in config l10n
-	cd ${WRKSRC}/binaries/data && ${PAX} -rw ${d} ${DESTDIR}${DATADIR}
-.endfor
-.if ${PKG_OPTIONS:Mtests}
-	cd ${WRKSRC}/binaries/data && ${PAX} -rw tests ${DESTDIR}${DATADIR}
+	cd ${WRKSRC}/binaries/data && ${PAX} -rw l10n ${DESTDIR}${DATADIR}
+.if !empty(PKG_OPTIONS:Mtests)
+	cd ${WRKSRC}/binaries/data && ${PAX} -rw config tests ${DESTDIR}${DATADIR}
 .endif
-.if ${PKG_OPTIONS:Meditor}
+.if !empty(PKG_OPTIONS:Meditor)
 	cd ${WRKSRC}/binaries/data && ${PAX} -rw tools ${DESTDIR}${DATADIR}
 .endif
-	${TAR} xf ${WRKSRC}/binaries/data/mods/public/public.zip -C ${DESTDIR}${DATADIR}/mods/public --no-same-permissions
-	${TAR} xf ${WRKSRC}/binaries/data/mods/mod/mod.zip -C ${DESTDIR}${DATADIR}/mods/mod --no-same-permissions
+	#${TAR} xf ${WRKSRC}/binaries/data/mods/public/public.zip -C ${DESTDIR}${DATADIR}/mods/public --no-same-permissions
+	#${TAR} xf ${WRKSRC}/binaries/data/mods/mod/mod.zip -C ${DESTDIR}${DATADIR}/mods/mod --no-same-permissions
 
 
 .include "../../audio/libvorbis/buildlink3.mk"
@@ -121,7 +120,6 @@ do-install:
 .include "../../devel/nspr/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/MesaLib/buildlink3.mk"
-#.include "../../graphics/nvidia-texture-tools/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/openexr/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
diff --git a/0ad/PLIST b/0ad/PLIST
index 48d96a5493..af425e6022 100644
--- a/0ad/PLIST
+++ b/0ad/PLIST
@@ -1 +1,53 @@
 @comment $NetBSD$
+bin/0ad
+bin/pyrogenesis
+lib/0ad/libCollada.so
+lib/0ad/libatlas.a
+lib/0ad/libengine.a
+lib/0ad/libgladwrapper.a
+lib/0ad/libglooxwrapper.a
+lib/0ad/libgraphics.a
+lib/0ad/libgui.a
+lib/0ad/liblobby.a
+lib/0ad/liblowlevel.a
+lib/0ad/libmocks_real.a
+lib/0ad/libmocks_test.a
+lib/0ad/libmongoose.a
+lib/0ad/libnetwork.a
+lib/0ad/libnvcore.so
+lib/0ad/libnvimage.so
+lib/0ad/libnvmath.so
+lib/0ad/libnvtt.so
+lib/0ad/librlinterface.a
+lib/0ad/libscriptinterface.a
+lib/0ad/libsimulation2.a
+lib/0ad/libtinygettext.a
+share/0ad/l10n/.tx/config
+share/0ad/l10n/ast.engine.po
+share/0ad/l10n/ca.engine.po
+share/0ad/l10n/cs.engine.po
+share/0ad/l10n/de.engine.po
+share/0ad/l10n/el.engine.po
+share/0ad/l10n/en_GB.engine.po
+share/0ad/l10n/engine.pot
+share/0ad/l10n/es.engine.po
+share/0ad/l10n/eu.engine.po
+share/0ad/l10n/fi.engine.po
+share/0ad/l10n/fr.engine.po
+share/0ad/l10n/gd.engine.po
+share/0ad/l10n/hu.engine.po
+share/0ad/l10n/id.engine.po
+share/0ad/l10n/it.engine.po
+share/0ad/l10n/messages.json
+share/0ad/l10n/nl.engine.po
+share/0ad/l10n/pl.engine.po
+share/0ad/l10n/pt_BR.engine.po
+share/0ad/l10n/ru.engine.po
+share/0ad/l10n/sk.engine.po
+share/0ad/l10n/sv.engine.po
+share/0ad/l10n/tr.engine.po
+share/0ad/l10n/uk.engine.po
+share/applications/0ad.desktop
+share/pixmaps/0ad.png
+@pkgdir share/0ad/mods/public
+@pkgdir share/0ad/mods/mod
diff --git a/0ad/TODO b/0ad/TODO
index b0635454b7..7930835586 100644
--- a/0ad/TODO
+++ b/0ad/TODO
@@ -1,25 +1,31 @@
 [X] Fix iconv mismatch in tinygettext
-[ ] Create PLIST
+[x] Create PLIST
+[ ] Create PLIST for options
+[ ] Build with options
 
-In file included from /usr/pkg/include/mozjs-78/js/TraceKind.h:12:0,
-                 from /usr/pkg/include/mozjs-78/jspubtd.h:18,
-                 from ../../../source/scriptinterface/ScriptTypes.h:62,
-                 from ../../../source/scriptinterface/ScriptContext.h:21,
-                 from ../../../source/scriptinterface/ScriptContext.cpp:20:
-/usr/pkg/include/mozjs-78/js/TypeDecls.h:55:21: note: class type 'JS::Zone' is incomplete
- class JS_PUBLIC_API Zone;
-                     ^~~~
-gmake[3]: *** [scriptinterface.make:138: obj/scriptinterface_Release/ScriptContext.o] Error 1
-
-------------
-
-
-Linking test
-g++ -o "../../../binaries/system/test" obj/test_Release/test_Camera.o obj/test_Release/test_Color.o obj/test_Release/test_LOSTexture.o obj/test_Release/test_MapGenerator.o obj/test_Release/test_MeshManager.o obj/test_Release/test_ShaderManager.o obj/test_Release/test_Terrain.o obj/test_Release/test_TextureConverter.o obj/test_Release/test_TextureManager.o obj/test_Release/test_CGUIText.o obj/test_Release/test_GuiManager.o obj/test_Release/test_ParseString.o obj/test_Release/test_DynamicArena.o obj/test_Release/test_adapters.o obj/test_Release/test_allocators.o obj/test_Release/test_archive_zip.o obj/test_Release/test_trace.o obj/test_Release/test_vfs_real_path.o obj/test_Release/test_vfs_tree.o obj/test_Release/test_vfs_util.o obj/test_Release/test_posix.o obj/test_Release/test_rtl.o obj/test_Release/test_sysdep.o obj/test_Release/test_adts.o obj/test_Release/test_bits.o obj/test_Release/test_byte_order.o obj/test_Release/test_cache_adt.o obj/test_Release/test_fnv_hash.o obj
/test_Release/test_lib.o obj/test_Release/test_path.o obj/test_Release/test_path_util.o obj/test_Release/test_rand.o obj/test_Release/test_regex.o obj/test_Release/test_secure_crt.o obj/test_Release/test_wchar.o obj/test_Release/test_tex.o obj/test_Release/test_Bound.o obj/test_Release/test_BoundingSphere.o obj/test_Release/test_Brush.o obj/test_Release/test_Fixed.o obj/test_Release/test_FixedVector2D.o obj/test_Release/test_FixedVector3D.o obj/test_Release/test_MD5.o obj/test_Release/test_Matrix3d.o obj/test_Release/test_Sqrt.o obj/test_Release/test_Net.o obj/test_Release/test_NetMessage.o obj/test_Release/test_StunClient.o obj/test_Release/test_CmdLineArgs.o obj/test_Release/test_XMBData.o obj/test_Release/test_RelaxNG.o obj/test_Release/test_XMLWriter.o obj/test_Release/test_Xeromyces.o obj/test_Release/stub_impl_hack.o obj/test_Release/test_CColor.o obj/test_Release/test_CLogger.o obj/test_Release/test_CStr.o obj/test_Release/test_ConfigDB.o obj/test_Release/test_Future.o obj/tes
 t_Release/test_Hashing.o obj/test_Release/test_Hotkeys.o obj/test_Release/test_Mod.o obj/test_Release/test_ModIo.o obj/test_Release/test_TaskManager.o obj/test_Release/test_fmt.o obj/test_Release/test_test.o obj/test_Release/test_FunctionWrapper.o obj/test_Release/test_ScriptConversions.o obj/test_Release/test_ScriptInterface.o obj/test_Release/test_CinemaManager.o obj/test_Release/test_CommandQueue.o obj/test_Release/test_HierPathfinder.o obj/test_Release/test_ObstructionManager.o obj/test_Release/test_Pathfinder.o obj/test_Release/test_Position.o obj/test_Release/test_RangeManager.o obj/test_Release/test_TerritoryManager.o obj/test_Release/test_scripts.o obj/test_Release/test_CmpTemplateManager.o obj/test_Release/test_ComponentManager.o obj/test_Release/test_EntityMap.o obj/test_Release/test_ParamNode.o obj/test_Release/test_SerializeTemplates.o obj/test_Release/test_Serializer.o obj/test_Release/test_Simulation2.o obj/test_Release/test_root.o obj/test_Release/test_setup.o obj/tes
 t_Release/test_pkcs5_pbkdf5.o obj/test_Release/test_Preprocessor.o    -L../../../binaries/system -L../../../../../../../../pkg/lib -L../../../../../../../../X11R7/lib -Wl,--no-undefined -Wl,--as-needed -Wl,-z,relro -Wl,-rpath,/usr/pkg/lib/0ad -Wl,-R/usr/pkg/lib -Wl,-rpath,/usr/X11R7/lib -pthread -Wl,--start-group ../../../binaries/system/libnetwork.a ../../../binaries/system/librlinterface.a ../../../binaries/system/libtinygettext.a ../../../binaries/system/liblobby.a ../../../binaries/system/libglooxwrapper.a ../../../binaries/system/libsimulation2.a ../../../binaries/system/libscriptinterface.a ../../../binaries/system/libengine.a ../../../binaries/system/libgraphics.a ../../../binaries/system/libatlas.a ../../../binaries/system/libgui.a ../../../binaries/system/liblowlevel.a ../../../binaries/system/libgladwrapper.a ../../../binaries/system/libmongoose.a ../../../binaries/system/libmocks_test.a -lSDL2 -lpng16 -lmozjs-78 -lxml2 -lboost_filesystem -lboost_system -lenet -lcurl -licu
 i18n -licuuc -licudata -lsodium -lfmt -lfreetype -lbz2 -lopenal -lvorbisfile -lnvcore -lnvmath -lnvimage -lnvtt -lgloox -lresolv -lidn -lgnutls -lz -lminiupnpc -lX11 -lexecinfo -lrt -Wl,--end-group
-gmake[2]: Leaving directory '/usr/work/wip/0ad/work/0ad-0.0.26-alpha/build/workspaces/gcc'
-===> Installing for 0ad-0.0.26.alpha
-=> Generating pre-install file lists
-gmake: Makefile: No such file or directory
-gmake: *** No rule to make target 'Makefile'.  Stop.
-*** Error code 2
+=> Generating post-install file lists
+=> Checking file-check results for 0ad-0.0.26.alpha
+=> Checking for non-existent script interpreters in 0ad-0.0.26.alpha
+=> Checking file permissions in 0ad-0.0.26.alpha
+warning: /usr/work/wip/0ad/work/.destdir/usr/pkg/lib/0ad/libatlas.a: executable bit is set on non-executable file.
+warning: /usr/work/wip/0ad/work/.destdir/usr/pkg/lib/0ad/libengine.a: executable bit is set on non-executable file.
+warning: /usr/work/wip/0ad/work/.destdir/usr/pkg/lib/0ad/libgladwrapper.a: executable bit is set on non-executable file.
+warning: /usr/work/wip/0ad/work/.destdir/usr/pkg/lib/0ad/libglooxwrapper.a: executable bit is set on non-executable file.
+warning: /usr/work/wip/0ad/work/.destdir/usr/pkg/lib/0ad/libgraphics.a: executable bit is set on non-executable file.
+warning: /usr/work/wip/0ad/work/.destdir/usr/pkg/lib/0ad/libgui.a: executable bit is set on non-executable file.
+warning: /usr/work/wip/0ad/work/.destdir/usr/pkg/lib/0ad/liblobby.a: executable bit is set on non-executable file.
+warning: /usr/work/wip/0ad/work/.destdir/usr/pkg/lib/0ad/liblowlevel.a: executable bit is set on non-executable file.
+warning: /usr/work/wip/0ad/work/.destdir/usr/pkg/lib/0ad/libmocks_real.a: executable bit is set on non-executable file.
+warning: /usr/work/wip/0ad/work/.destdir/usr/pkg/lib/0ad/libmocks_test.a: executable bit is set on non-executable file.
+warning: /usr/work/wip/0ad/work/.destdir/usr/pkg/lib/0ad/libmongoose.a: executable bit is set on non-executable file.
+warning: /usr/work/wip/0ad/work/.destdir/usr/pkg/lib/0ad/libnetwork.a: executable bit is set on non-executable file.
+warning: /usr/work/wip/0ad/work/.destdir/usr/pkg/lib/0ad/librlinterface.a: executable bit is set on non-executable file.
+warning: /usr/work/wip/0ad/work/.destdir/usr/pkg/lib/0ad/libscriptinterface.a: executable bit is set on non-executable file.
+warning: /usr/work/wip/0ad/work/.destdir/usr/pkg/lib/0ad/libsimulation2.a: executable bit is set on non-executable file.
+warning: /usr/work/wip/0ad/work/.destdir/usr/pkg/lib/0ad/libtinygettext.a: executable bit is set on non-executable file.
+0 errors and 16 warnings.
+=> Checking for PIE in 0ad-0.0.26.alpha
+=> Checking for RELRO in 0ad-0.0.26.alpha
+=> Checking for missing run-time search paths in 0ad-0.0.26.alpha
+ERROR: lib/0ad/libnvmath.so: missing library: libnvcore.so
 
diff --git a/0ad/options.mk b/0ad/options.mk
index 83220e4bab..1f8da28273 100644
--- a/0ad/options.mk
+++ b/0ad/options.mk
@@ -1,6 +1,6 @@
 # $NetBSD$
 PKG_OPTIONS_VAR=	PKG_OPTIONS.0ad
-PKG_SUPPORTED_OPTIONS+=	tests
+PKG_SUPPORTED_OPTIONS+=	tests editor
 
 .include "../../mk/bsd.options.mk"
Home | Main Index | Thread Index | Old Index