From fc6cbda8bc99732c882bebfbcb70c56a9dbaa6b6 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 21 Jan 2024 16:09:47 +0100 Subject: chocolate-doom: add new package, add all dependencies and updates required to build --- package/Config.in | 1 + package/chocolate-doom/Makefile | 32 +++++++++++++++++++++++++ package/libxcb/Makefile | 4 ++-- package/sdl2-mixer/Makefile | 29 ++++++++++++++++++++++ package/sdl2-net/Makefile | 29 ++++++++++++++++++++++ package/sdl2/Makefile | 29 ++++++++++++++++++++++ package/section.lst | 1 + package/xcb-proto/Makefile | 8 +++---- package/xcb-proto/patches/patch-xcb-proto_pc_in | 11 +++++---- 9 files changed, 132 insertions(+), 12 deletions(-) create mode 100644 package/chocolate-doom/Makefile create mode 100644 package/sdl2-mixer/Makefile create mode 100644 package/sdl2-net/Makefile create mode 100644 package/sdl2/Makefile diff --git a/package/Config.in b/package/Config.in index fd578b8c9..248d66fff 100644 --- a/package/Config.in +++ b/package/Config.in @@ -26,6 +26,7 @@ source package/Config.in.auto.app.chat source package/Config.in.auto.app.crypto source package/Config.in.auto.app.debug source package/Config.in.auto.app.editor +source package/Config.in.auto.app.games source package/Config.in.auto.app.p2p endmenu diff --git a/package/chocolate-doom/Makefile b/package/chocolate-doom/Makefile new file mode 100644 index 000000000..08ddc55d9 --- /dev/null +++ b/package/chocolate-doom/Makefile @@ -0,0 +1,32 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include $(ADK_TOPDIR)/rules.mk + +PKG_NAME:= chocolate-doom +PKG_VERSION:= 3.0.1 +PKG_RELEASE:= 1 +PKG_HASH:= a54383beef6a52babc5b00d58fcf53a454f012ced7b1936ba359b13f1f10ac66 +PKG_DESCR:= doom +PKG_SECTION:= app/games +PKG_DEPENDS:= libsdl2 libsdl2-mixer libsdl2-net +PKG_BUILDDEP:= sdl2 sdl2-mixer sdl2-net +PKG_URL:= https://www.chocolate-doom.org +PKG_SITES:= https://github.com/chocolate-doom/chocolate-doom/archive/refs/tags/ + +DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.gz +WRKDIST= ${WRKDIR}/$(PKG_NAME)-$(PKG_NAME)-$(PKG_VERSION) + +include $(ADK_TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,CHOCOLATE_DOOM,chocolate-doom,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION))) + +AUTOTOOL_STYLE:= autogen +TARGET_CFLAGS+= -fcommon + +chocolate-doom-install: + $(INSTALL_DIR) $(IDIR_CHOCOLATE_DOOM)/usr/bin + $(INSTALL_BIN) $(WRKINST)/usr/bin/chocolate-doom \ + $(IDIR_CHOCOLATE_DOOM)/usr/bin + +include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/libxcb/Makefile b/package/libxcb/Makefile index 7e5c3c00e..5dbd1b4b5 100644 --- a/package/libxcb/Makefile +++ b/package/libxcb/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= libxcb -PKG_VERSION:= 1.14 +PKG_VERSION:= 1.16 PKG_RELEASE:= 1 -PKG_HASH:= 2c7fcddd1da34d9b238c9caeda20d3bd7486456fc50b3cc6567185dbd5b0ad02 +PKG_HASH:= bc0f75f84b28e6496a19a1d094d7e47def861a50cb7cce5b23b62eecdc2a4479 PKG_DESCR:= interface to the x window system protocol PKG_SECTION:= x11/libs PKG_BUILDDEP:= python3 libpthread-stubs libxslt libXau xcb-proto diff --git a/package/sdl2-mixer/Makefile b/package/sdl2-mixer/Makefile new file mode 100644 index 000000000..f77239a75 --- /dev/null +++ b/package/sdl2-mixer/Makefile @@ -0,0 +1,29 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include $(ADK_TOPDIR)/rules.mk + +PKG_NAME:= sdl2-mixer +PKG_VERSION:= 2.6.3 +PKG_RELEASE:= 1 +PKG_HASH:= 7a6ba86a478648ce617e3a5e9277181bc67f7ce9876605eea6affd4a0d6eea8f +PKG_DESCR:= simple directmedia layer mixer 2 +PKG_SECTION:= libs/misc +PKG_URL:= http://www.libsdl.org/ +PKG_SITES:= http://www.libsdl.org/projects/SDL_mixer/release/ +PKG_LIBNAME:= libsdl2-mixer +PKG_OPTS:= dev + +DISTFILES:= SDL2_mixer-$(PKG_VERSION).tar.gz +WRKDIST= ${WRKDIR}/SDL2_mixer-$(PKG_VERSION) + +include $(ADK_TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,LIBSDL2_MIXER,libsdl2-mixer,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS))) + +libsdl2-mixer-install: + $(INSTALL_DIR) $(IDIR_LIBSDL2_MIXER)/usr/lib + $(CP) $(WRKINST)/usr/lib/libSDL2*.so* \ + $(IDIR_LIBSDL2_MIXER)/usr/lib + +include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/sdl2-net/Makefile b/package/sdl2-net/Makefile new file mode 100644 index 000000000..94691a884 --- /dev/null +++ b/package/sdl2-net/Makefile @@ -0,0 +1,29 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include $(ADK_TOPDIR)/rules.mk + +PKG_NAME:= sdl2-net +PKG_VERSION:= 2.2.0 +PKG_RELEASE:= 1 +PKG_HASH:= 4e4a891988316271974ff4e9585ed1ef729a123d22c08bd473129179dc857feb +PKG_DESCR:= simple directmedia layer net 2 +PKG_SECTION:= libs/misc +PKG_URL:= http://www.libsdl.org/ +PKG_SITES:= http://www.libsdl.org/projects/SDL_net/release/ +PKG_LIBNAME:= libsdl2-net +PKG_OPTS:= dev + +DISTFILES:= SDL2_net-$(PKG_VERSION).tar.gz +WRKDIST= ${WRKDIR}/SDL2_net-$(PKG_VERSION) + +include $(ADK_TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,LIBSDL2_NET,libsdl2-net,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS))) + +libsdl2-net-install: + $(INSTALL_DIR) $(IDIR_LIBSDL2_NET)/usr/lib + $(CP) $(WRKINST)/usr/lib/libSDL2*.so* \ + $(IDIR_LIBSDL2_NET)/usr/lib + +include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/sdl2/Makefile b/package/sdl2/Makefile new file mode 100644 index 000000000..2133ba867 --- /dev/null +++ b/package/sdl2/Makefile @@ -0,0 +1,29 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include $(ADK_TOPDIR)/rules.mk + +PKG_NAME:= sdl2 +PKG_VERSION:= 2.28.5 +PKG_RELEASE:= 1 +PKG_HASH:= 9f0556e4a24ef5b267010038ad9e9948b62f236d5bcc4b22179f95ef62d84023 +PKG_DESCR:= simple directmedia layer 2 +PKG_SECTION:= libs/misc +PKG_URL:= http://www.libsdl.org/ +PKG_SITES:= https://github.com/libsdl-org/SDL/archive/refs/tags/ +PKG_LIBNAME:= libsdl2 +PKG_OPTS:= dev + +DISTFILES:= release-$(PKG_VERSION).tar.gz +WRKDIST= ${WRKDIR}/SDL-release-$(PKG_VERSION) + +include $(ADK_TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,LIBSDL2,libsdl2,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS))) + +libsdl2-install: + $(INSTALL_DIR) $(IDIR_LIBSDL2)/usr/lib + $(CP) $(WRKINST)/usr/lib/libSDL2*.so* \ + $(IDIR_LIBSDL2)/usr/lib + +include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/section.lst b/package/section.lst index 724fbdf32..a1fead9bb 100644 --- a/package/section.lst +++ b/package/section.lst @@ -19,6 +19,7 @@ app/chat Chat app/crypto Cryptography app/debug Debugging and Analyzing app/editor Editor and Pager +app/games Games app/p2p P2P net/acct IP Accounting net/dns DNS and DHCP diff --git a/package/xcb-proto/Makefile b/package/xcb-proto/Makefile index 5e45e6afd..d5639997b 100644 --- a/package/xcb-proto/Makefile +++ b/package/xcb-proto/Makefile @@ -4,17 +4,15 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= xcb-proto -PKG_VERSION:= 1.14.1 +PKG_VERSION:= 1.16.0 PKG_RELEASE:= 1 -PKG_HASH:= 85cd21e9d9fbc341d0dbf11eace98d55d7db89fda724b0e598855fcddf0944fd +PKG_HASH:= a75a1848ad2a89a82d841a51be56ce988ff3c63a8d6bf4383ae3219d8d915119 PKG_DESCR:= xml-xcb protocol descriptions PKG_SECTION:= dev/header HOST_BUILDDEP:= python3-host -PKG_SITES:= http://xcb.freedesktop.org/dist/ +PKG_SITES:= https://xorg.freedesktop.org/archive/individual/proto/ PKG_OPTS:= dev devonly -DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz - include $(ADK_TOPDIR)/mk/host.mk include $(ADK_TOPDIR)/mk/package.mk diff --git a/package/xcb-proto/patches/patch-xcb-proto_pc_in b/package/xcb-proto/patches/patch-xcb-proto_pc_in index c5404312e..3732f4310 100644 --- a/package/xcb-proto/patches/patch-xcb-proto_pc_in +++ b/package/xcb-proto/patches/patch-xcb-proto_pc_in @@ -1,12 +1,13 @@ ---- xcb-proto-1.14.orig/xcb-proto.pc.in 2020-02-22 21:16:54.000000000 +0100 -+++ xcb-proto-1.14/xcb-proto.pc.in 2023-01-04 18:28:01.354784124 +0100 -@@ -3,8 +3,8 @@ exec_prefix=@exec_prefix@ +--- xcb-proto-1.16.0.orig/xcb-proto.pc.in 2023-08-16 22:10:21.000000000 +0200 ++++ xcb-proto-1.16.0/xcb-proto.pc.in 2024-01-21 13:00:16.488006595 +0100 +@@ -2,9 +2,9 @@ prefix=@prefix@ + exec_prefix=@exec_prefix@ datarootdir=@datarootdir@ datadir=@datadir@ - libdir=@libdir@ -xcbincludedir=${pc_sysrootdir}@xcbincludedir@ --pythondir=${pc_sysrootdir}@pythondir@ +xcbincludedir=@xcbincludedir@ + PYTHON_PREFIX=@PYTHON_PREFIX@ +-pythondir=${pc_sysrootdir}@pythondir@ +pythondir=@pythondir@ Name: XCB Proto -- cgit v1.2.3