From nobody Tue Nov 09 13:13:18 2021 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4102C1845385; Tue, 9 Nov 2021 13:13:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4HpT1p5zfhz3Ly7; Tue, 9 Nov 2021 13:13:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 8CF35259A4; Tue, 9 Nov 2021 13:13:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1A9DDIJ9013302; Tue, 9 Nov 2021 13:13:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1A9DDIZt013301; Tue, 9 Nov 2021 13:13:18 GMT (envelope-from git) Date: Tue, 9 Nov 2021 13:13:18 GMT Message-Id: <202111091313.1A9DDIZt013301@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dmitry Marakasov Subject: git: 383777462259 - main - x11-toolkits/irrlicht: update to 1.8.5 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: amdmi3 X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 383777462259002cf325bfb33441f9b8cb5d9847 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by amdmi3: URL: https://cgit.FreeBSD.org/ports/commit/?id=383777462259002cf325bfb33441f9b8cb5d9847 commit 383777462259002cf325bfb33441f9b8cb5d9847 Author: Dmitry Marakasov AuthorDate: 2021-11-09 12:45:26 +0000 Commit: Dmitry Marakasov CommitDate: 2021-11-09 13:12:12 +0000 x11-toolkits/irrlicht: update to 1.8.5 - Pet portlint - Make sure to remove bundled dependencies - Strip library - Remove no longer needed patch --- x11-toolkits/irrlicht/Makefile | 13 ++++++++++--- x11-toolkits/irrlicht/distinfo | 6 +++--- x11-toolkits/irrlicht/files/patch-source-Irrlicht_Makefile | 9 +++++---- .../files/patch-source__Irrlicht__COpenGLExtensionHandler.h | 12 ------------ 4 files changed, 18 insertions(+), 22 deletions(-) diff --git a/x11-toolkits/irrlicht/Makefile b/x11-toolkits/irrlicht/Makefile index 844e93ce9d26..7ca5cfe37a4a 100644 --- a/x11-toolkits/irrlicht/Makefile +++ b/x11-toolkits/irrlicht/Makefile @@ -1,8 +1,7 @@ # Created by: Simon Barner PORTNAME= irrlicht -PORTVERSION= 1.8.4 -PORTREVISION= 3 +PORTVERSION= 1.8.5 CATEGORIES= x11-toolkits graphics MASTER_SITES= SF/${PORTNAME}/Irrlicht%20SDK/${PORTVERSION:R}/${PORTVERSION}/ @@ -14,8 +13,8 @@ LICENSE_FILE= ${WRKSRC}/readme.txt LIB_DEPENDS= libpng.so:graphics/png -DOS2UNIX_GLOB= Makefile *.cpp *.h *.txt USES= alias cpe dos2unix gl gmake jpeg zip xorg +DOS2UNIX_GLOB= Makefile *.cpp *.h *.txt USE_GL= gl USE_XORG= x11 xxf86vm USE_LDCONFIG= yes @@ -35,6 +34,11 @@ OPTIONS_DEFINE= DEBUG EXAMPLES DEBUG_MAKE_ENV_OFF= NDEBUG=1 +post-extract: +.for bundled in bzip2 jpeglib libpng zlib + @${RM} -r ${WRKSRC}/source/Irrlicht/${bundled} +.endfor + post-patch: @${REINPLACE_CMD} -e '/#define.*_IRR_USE_NON_SYSTEM_JPEG_LIB_/ d' \ -e '/#define.*_IRR_USE_NON_SYSTEM_LIB_PNG_/ d' \ @@ -43,6 +47,9 @@ post-patch: -e '/#define.*_IRR_COMPILE_WITH_JOYSTICK_EVENTS_/ d' \ ${WRKSRC}/include/IrrCompileConfig.h +post-install: + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libIrrlicht.so + post-install-EXAMPLES-on: cd ${WRKSRC}/examples && ${COPYTREE_SHARE} "${EXAMPLEDIRS}" \ ${STAGEDIR}${EXAMPLESDIR} \ diff --git a/x11-toolkits/irrlicht/distinfo b/x11-toolkits/irrlicht/distinfo index 72199b037e84..c35fcf093d4e 100644 --- a/x11-toolkits/irrlicht/distinfo +++ b/x11-toolkits/irrlicht/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1471244398 -SHA256 (irrlicht-1.8.4.zip) = f42b280bc608e545b820206fe2a999c55f290de5c7509a02bdbeeccc1bf9e433 -SIZE (irrlicht-1.8.4.zip) = 27927144 +TIMESTAMP = 1636380510 +SHA256 (irrlicht-1.8.5.zip) = effb7beed3985099ce2315a959c639b4973aac8210f61e354475a84105944f3d +SIZE (irrlicht-1.8.5.zip) = 21827696 diff --git a/x11-toolkits/irrlicht/files/patch-source-Irrlicht_Makefile b/x11-toolkits/irrlicht/files/patch-source-Irrlicht_Makefile index 45820c030e0f..a4b9a956780f 100644 --- a/x11-toolkits/irrlicht/files/patch-source-Irrlicht_Makefile +++ b/x11-toolkits/irrlicht/files/patch-source-Irrlicht_Makefile @@ -1,12 +1,13 @@ ---- source/Irrlicht/Makefile.orig 2014-10-18 07:47:20 UTC +--- source/Irrlicht/Makefile.orig 2021-11-08 14:14:39 UTC +++ source/Irrlicht/Makefile -@@ -56,23 +56,20 @@ +@@ -58,23 +58,20 @@ BZIP2OBJ = bzip2/blocksort.o bzip2/huffman.o bzip2/crc EXTRAOBJ = LINKOBJ = $(IRRMESHOBJ) $(IRROBJ) $(IRRPARTICLEOBJ) $(IRRANIMOBJ) \ $(IRRVIDEOOBJ) $(IRRSWRENDEROBJ) $(IRRIOOBJ) $(IRROTHEROBJ) \ - $(IRRGUIOBJ) $(ZLIBOBJ) $(JPEGLIBOBJ) $(LIBPNGOBJ) $(LIBAESGM) \ +- $(BZIP2OBJ) $(EXTRAOBJ) + $(IRRGUIOBJ) $(LIBAESGM) \ - $(BZIP2OBJ) $(EXTRAOBJ) ++ $(EXTRAOBJ) ############### #Compiler flags @@ -26,7 +27,7 @@ sharedlib sharedlib_osx: CXXFLAGS += -fPIC sharedlib sharedlib_osx: CFLAGS += -fPIC -@@ -83,13 +80,13 @@ +@@ -85,13 +82,13 @@ LIBSELECT=64 endif #Linux specific options diff --git a/x11-toolkits/irrlicht/files/patch-source__Irrlicht__COpenGLExtensionHandler.h b/x11-toolkits/irrlicht/files/patch-source__Irrlicht__COpenGLExtensionHandler.h deleted file mode 100644 index 8833461a0710..000000000000 --- a/x11-toolkits/irrlicht/files/patch-source__Irrlicht__COpenGLExtensionHandler.h +++ /dev/null @@ -1,12 +0,0 @@ ---- source/Irrlicht/COpenGLExtensionHandler.h.orig 2014-10-18 08:53:44 UTC -+++ source/Irrlicht/COpenGLExtensionHandler.h -@@ -59,6 +59,9 @@ - #endif - #include - #include -+ #ifndef PFNGLBLENDEQUATIONPROC -+ typedef void (APIENTRYP PFNGLBLENDEQUATIONPROC) (GLenum mode); -+ #endif - #if defined(_IRR_OPENGL_USE_EXTPOINTER_) - #include "glext.h" - #undef GLX_ARB_get_proc_address // avoid problems with local glxext.h