Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 1 Apr 2015 17:39:51 +0000 (UTC)
From:      Dmitry Marakasov <amdmi3@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r382930 - in head/devel/sfml1: . files
Message-ID:  <201504011739.t31HdpVI001679@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: amdmi3
Date: Wed Apr  1 17:39:50 2015
New Revision: 382930
URL: https://svnweb.freebsd.org/changeset/ports/382930

Log:
  - Remove useless -lpthread replacement
  - Try to fix build under DragonFly

Added:
  head/devel/sfml1/files/patch-include_SFML_System_ResourcePtr.inl   (contents, props changed)
Modified:
  head/devel/sfml1/Makefile
  head/devel/sfml1/files/patch-src__SFML__System__Makefile

Modified: head/devel/sfml1/Makefile
==============================================================================
--- head/devel/sfml1/Makefile	Wed Apr  1 17:38:43 2015	(r382929)
+++ head/devel/sfml1/Makefile	Wed Apr  1 17:39:50 2015	(r382930)
@@ -18,7 +18,7 @@ LIB_DEPENDS=	libsndfile.so:${PORTSDIR}/a
 		libfreetype.so:${PORTSDIR}/print/freetype2
 
 USES=		gmake openal:al pkgconfig dos2unix
-DOS2UNIX_GLOB=	Makefile
+DOS2UNIX_GLOB=	Makefile ResourcePtr.inl
 USE_XORG=	x11 xrandr
 USE_GL=		gl glu
 USE_LDCONFIG=	yes

Added: head/devel/sfml1/files/patch-include_SFML_System_ResourcePtr.inl
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/sfml1/files/patch-include_SFML_System_ResourcePtr.inl	Wed Apr  1 17:39:50 2015	(r382930)
@@ -0,0 +1,10 @@
+--- include/SFML/System/ResourcePtr.inl.orig	2010-01-27 16:53:54.000000000 +0300
++++ include/SFML/System/ResourcePtr.inl	2015-03-27 15:46:53.809250000 +0300
+@@ -22,6 +22,7 @@
+ //
+ ////////////////////////////////////////////////////////////
+ 
++#include <cstddef>
+ 
+ ////////////////////////////////////////////////////////////
+ /// Default constructor

Modified: head/devel/sfml1/files/patch-src__SFML__System__Makefile
==============================================================================
--- head/devel/sfml1/files/patch-src__SFML__System__Makefile	Wed Apr  1 17:38:43 2015	(r382929)
+++ head/devel/sfml1/files/patch-src__SFML__System__Makefile	Wed Apr  1 17:39:50 2015	(r382930)
@@ -16,7 +16,7 @@
 -libsfml-system.so: $(OBJ)
 -	$(CPP) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBNAME) $(OBJ) -lpthread
 +libsfml1-system.so: $(OBJ)
-+	$(CXX) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBNAME) $(OBJ) -pthread
++	$(CXX) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBNAME) $(OBJ) -lpthread
  
  $(OBJ): %.o: %.cpp
 -	$(CPP) -o $@ -c $< $(CFLAGS)



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201504011739.t31HdpVI001679>