Attachment 138889 Details for Bug 185001 – update_irrlicht-1.8.1.txt

update_irrlicht-1.8.1.txt

update_irrlicht-1.8.1.txt (text/plain), 4.62 KB, created by hardy.schumacher on 2013-12-21 17:01:53 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: hardy.schumacher

Created: 2013-12-21 17:01:53 UTC

Size: 4.62 KB

patch

obsolete

>diff -ruN /usr/ports/x11-toolkits/irrlicht/Makefile ./irrlicht/Makefile
>--- /usr/ports/x11-toolkits/irrlicht/Makefile	2013-10-02 20:54:30.000000000 +0200
>+++ ./irrlicht/Makefile	2013-12-21 17:55:32.000000000 +0100
>@@ -2,19 +2,22 @@
> # $FreeBSD: head/x11-toolkits/irrlicht/Makefile 329011 2013-10-02 02:04:16Z acm $
> 
> PORTNAME=	irrlicht
>-PORTVERSION=	1.8
>+PORTVERSION=	1.8.1
> CATEGORIES=	x11-toolkits graphics
>-MASTER_SITES=	SF/${PORTNAME}/Irrlicht%20SDK/${PORTVERSION}/
>+MASTER_SITES=	SF/${PORTNAME}/Irrlicht%20SDK/1.8/${PORTVERSION}/
> 
> MAINTAINER=	acm@FreeBSD.org
> COMMENT=	High performance realtime 3D engine
> 
>+LICENSE=	ZLIB
>+LICENSE_FILE=   ${WRKSRC}/readme.txt
>+
> LIB_DEPENDS=	jpeg:${PORTSDIR}/graphics/jpeg \
> 		png15:${PORTSDIR}/graphics/png
> 
> USE_ZIP=	yes
>-USE_DOS2UNIX=	Makefile *.cpp *.h *.txt
>-USES=		gmake
>+USES=		dos2unix gmake
>+DOS2UNIX_GLOB=	Makefile *.cpp *.h *.txt
> USE_GL=		yes
> USE_LDCONFIG=	yes
> CFLAGS+=	-I${LOCALBASE}/include/libpng15
>@@ -30,19 +33,16 @@
> 		11.PerPixelLighting 12.TerrainRendering 13.RenderToTexture 15.LoadIrrFile \
> 		Demo
> 
>-OPTIONS_DEFINE=	DEBUG EXAMPLES JOYSTICK
>-JOYSTICK_DESC=	Support for Linux Joystick
>+OPTIONS_DEFINE=	DEBUG EXAMPLES
> 
>-NO_STAGE=	yes
> .include <bsd.port.options.mk>
> 
> .if (${ARCH} == "amd64") || (${ARCH} == "ia64")
> CFLAGS+=	-fPIC
> .endif
> 
>-.if ${ARCH} == "sparc64"
>-BROKEN=		Does not compile on sparc64
>-.endif
>+NOT_FOR_ARCHS=	sparc64
>+NOT_FOR_ARCHS_REASON=	Does not compile on ${ARCH}
> 
> .if ${PORT_OPTIONS:MEXAMPLES}
> PLIST_SUB+=	EXAMPLES=""
>@@ -50,18 +50,10 @@
> PLIST_SUB+=	EXAMPLES="@comment "
> .endif
> 
>-.if ${PORT_OPTIONS:MJOYSTICK}
>-BUILD_DEPENDS+=	${LOCALBASE}/include/linux/joystick.h:${PORTSDIR}/devel/linux-js
>-HAVE_JOYSTICK=	true
>-.endif
>-
> .if ${PORT_OPTIONS:MDEBUG}
> MAKE_ENV+=	NDEBUG=1
> .endif
> 
>-post-extract:
>-#	@${RM} ${WRKSRC}/media/Thumbs.db
>-
> post-patch:
> 	@${REINPLACE_CMD} -e '/#define.*_IRR_USE_NON_SYSTEM_JPEG_LIB_/ d' \
> 		-e '/#define.*_IRR_USE_NON_SYSTEM_LIB_PNG_/ d' \
>diff -ruN /usr/ports/x11-toolkits/irrlicht/distinfo ./irrlicht/distinfo
>--- /usr/ports/x11-toolkits/irrlicht/distinfo	2013-10-02 20:54:30.000000000 +0200
>+++ ./irrlicht/distinfo	2013-12-19 14:57:24.000000000 +0100
>@@ -1,2 +1,2 @@
>-SHA256 (irrlicht-1.8.zip) = f8756c3cf83f16f41eb1eca8f4ebb530f0e8fd572443905e3d8eb8f09445a642
>-SIZE (irrlicht-1.8.zip) = 23674513
>+SHA256 (irrlicht-1.8.1.zip) = 814bb90116d5429449ba1d169e2cbff881c473b7eada4c2447132bc4f4a6e97b
>+SIZE (irrlicht-1.8.1.zip) = 24167632
>diff -ruN /usr/ports/x11-toolkits/irrlicht/files/patch-source-Irrlicht_Makefile ./irrlicht/files/patch-source-Irrlicht_Makefile
>--- /usr/ports/x11-toolkits/irrlicht/files/patch-source-Irrlicht_Makefile	2013-10-02 20:54:31.000000000 +0200
>+++ ./irrlicht/files/patch-source-Irrlicht_Makefile	2013-12-19 14:57:24.000000000 +0100
>@@ -1,15 +1,15 @@
>---- source/Irrlicht/Makefile	2013-10-01 14:38:36.000000000 -0500
>-+++ source/Irrlicht/Makefile	2013-10-01 14:45:15.000000000 -0500
>+--- source/Irrlicht/Makefile	2013-12-19 13:56:12.000000000 +0100
>++++ source/Irrlicht/Makefile	2013-12-19 13:24:04.000000000 +0100
> @@ -2,7 +2,7 @@
>  VERSION_MINOR = 8
>- VERSION_RELEASE = 0
>- # Irrlicht Engine 1.8.0
>+ VERSION_RELEASE = 1
>+ # Irrlicht Engine 1.8.1
> -# Makefile for Linux
> +# Makefile for Linux/FreeBSD
>  #
>  # To use, just run:
>  #
>-@@ -56,23 +56,22 @@
>+@@ -56,23 +56,20 @@
>  EXTRAOBJ =
>  LINKOBJ = $(IRRMESHOBJ) $(IRROBJ) $(IRRPARTICLEOBJ) $(IRRANIMOBJ) \
>  	$(IRRVIDEOOBJ) $(IRRSWRENDEROBJ) $(IRRIOOBJ) $(IRROTHEROBJ) \
>@@ -25,9 +25,8 @@
>  CXXFLAGS += -Wall -pipe -fno-exceptions -fno-rtti -fstrict-aliasing
>  ifndef NDEBUG
>  CXXFLAGS += -g -D_DEBUG
>- else
>+-else
> -CXXFLAGS += -fexpensive-optimizations -O3
>-+CXXFLAGS += 
>  endif
>  ifdef PROFILE
>  CXXFLAGS += -pg
>@@ -36,7 +35,7 @@
>  
>  sharedlib sharedlib_osx: CXXFLAGS += -fPIC
>  sharedlib sharedlib_osx: CFLAGS += -fPIC
>-@@ -83,13 +82,13 @@
>+@@ -83,13 +80,13 @@
>  endif
>  
>  #Linux specific options
>@@ -54,7 +53,7 @@
>  
>  #OSX specific options
>  staticlib_osx sharedlib_osx install_osx: SYSTEM = MacOSX
>-@@ -117,13 +116,13 @@
>+@@ -117,7 +114,7 @@
>  
>  ####################
>  # All target, builds Irrlicht as static lib (libIrrlicht.a) and copies it into lib/Linux
>@@ -63,11 +62,3 @@
>  
>  # Builds Irrlicht as shared lib (libIrrlicht.so.versionNumber) and copies it into lib/Linux
>  sharedlib: $(LINKOBJ)
>--	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -shared -Wl,-soname,$(SONAME) -o $(SHARED_FULLNAME) $^ $(LDFLAGS)
>-+	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -shared -Wl,-soname,$(SHARED_LIB).$(SHLIB_VER) -o $(SHARED_LIB).$(SHLIB_VER) $^ $(LDFLAGS)
>- 	mkdir -p $(LIB_PATH)
>--	cp $(SHARED_FULLNAME) $(LIB_PATH)
>-+	cp $(SHARED_LIB).$(SHLIB_VER) $(LIB_PATH)
>- 
>- # Builds Irrlicht as static lib (libIrrlicht.a)
>- $(STATIC_LIB): $(LINKOBJ)

Actions: View

Attachments on bug 185001: 138887 | 138888 | 138889