pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
sfml+: partial update to 2.3.2, added TODO
Module Name: pkgsrc-wip
Committed By: coypu <coypu%sdf.org@localhost>
Pushed By: coypu
Date: Wed Jul 27 11:58:48 2016 +0300
Changeset: 27974f5803399602ad130db71c067f368961d006
Modified Files:
sfml+/Makefile
sfml+/distinfo
sfml+/patches/patch-include_SFML_Config.hpp
Added Files:
sfml+/TODO
Removed Files:
sfml+/patches/patch-include_SFML_Window_OpenGL.hpp
sfml+/patches/patch-include_SFML_Window_WindowHandle.hpp
sfml+/patches/patch-src_SFML_Makefile
sfml+/patches/patch-src_SFML_Network_SelectorBase.cpp
sfml+/patches/patch-src_SFML_System_Platform.hpp
sfml+/patches/patch-src_SFML_Window_Joystick.hpp
sfml+/patches/patch-src_SFML_Window_Linux_Joystick.cpp
sfml+/patches/patch-src_SFML_Window_Linux_Joystick.hpp
sfml+/patches/patch-src_SFML_Window_VideoModeSupport.hpp
sfml+/patches/patch-src_SFML_Window_WindowImpl.cpp
Log Message:
sfml+: partial update to 2.3.2, added TODO
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=27974f5803399602ad130db71c067f368961d006
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
sfml+/Makefile | 12 +++---
sfml+/TODO | 1 +
sfml+/distinfo | 29 +++++++------
sfml+/patches/patch-include_SFML_Config.hpp | 30 ++++++-------
sfml+/patches/patch-include_SFML_Window_OpenGL.hpp | 15 -------
.../patch-include_SFML_Window_WindowHandle.hpp | 15 -------
sfml+/patches/patch-src_SFML_Makefile | 50 ----------------------
.../patch-src_SFML_Network_SelectorBase.cpp | 14 ------
sfml+/patches/patch-src_SFML_System_Platform.hpp | 15 -------
sfml+/patches/patch-src_SFML_Window_Joystick.hpp | 15 -------
.../patch-src_SFML_Window_Linux_Joystick.cpp | 24 -----------
.../patch-src_SFML_Window_Linux_Joystick.hpp | 16 -------
.../patch-src_SFML_Window_VideoModeSupport.hpp | 15 -------
sfml+/patches/patch-src_SFML_Window_WindowImpl.cpp | 15 -------
14 files changed, 37 insertions(+), 229 deletions(-)
diffs:
diff --git a/sfml+/Makefile b/sfml+/Makefile
index fbd0c8a..ce2d273 100644
--- a/sfml+/Makefile
+++ b/sfml+/Makefile
@@ -1,7 +1,7 @@
# $NetBSD: Makefile,v 1.6 2015/02/24 17:25:10 blef Exp $
-DISTNAME= SFML-1.6-sdk-linux-64
-PKGNAME= sfml+-1.6
+DISTNAME= SFML-2.3.2-sources
+PKGNAME= sfml+-2.3.2
CATEGORIES= multimedia
MASTER_SITES= http://www.sfml-dev.org/files/
@@ -9,10 +9,12 @@ MAINTAINER= pkgsrc-users%NetBSD.org@localhost
HOMEPAGE= http://www.sfml-dev.org/
COMMENT= Free multimedia C++ API
LICENSE= zlib
+EXTRACT_SUFX= .zip
-WRKSRC= ${WRKDIR}/SFML-1.6
+WRKSRC= ${WRKDIR}/SFML-2.3.2
+USE_CMAKE= yes
USE_LANGUAGES= c c++
-USE_TOOLS+= gmake rm
+USE_TOOLS+= rm
CPPFLAGS+= -I${BUILDLINK_PREFIX.glu}/include
CPPFLAGS+= -I${BUILDLINK_PREFIX.freetype2}/include/freetype2
LDFLAGS+= -L${BUILDLINK_PREFIX.libsndfile}/lib
@@ -31,7 +33,7 @@ post-install:
${RM} ${DESTDIR}${PREFIX}/include/SFML/Window/WindowHandle.hpp.orig
.include "../../graphics/glu/buildlink3.mk"
-.include "../../audio/openal/buildlink3.mk"
+.include "../../audio/openal-soft/buildlink3.mk"
.include "../../audio/libsndfile/buildlink3.mk"
.include "../../mk/jpeg.buildlink3.mk"
.include "../../graphics/glew/buildlink3.mk"
diff --git a/sfml+/TODO b/sfml+/TODO
new file mode 100644
index 0000000..5e5fe47
--- /dev/null
+++ b/sfml+/TODO
@@ -0,0 +1 @@
+WindowHandle not declared (where could it come from?)
diff --git a/sfml+/distinfo b/sfml+/distinfo
index 4bfd11d..c4aa55a 100644
--- a/sfml+/distinfo
+++ b/sfml+/distinfo
@@ -1,16 +1,17 @@
$NetBSD: distinfo,v 1.1 2012/10/03 15:05:59 othyro Exp $
-SHA1 (SFML-1.6-sdk-linux-64.tar.gz) = 310005ddd16f0beb1517d3d0826eeb76fdee2bbc
-RMD160 (SFML-1.6-sdk-linux-64.tar.gz) = 871ab26dc7931597c82cecd2c91c3469f15ef195
-Size (SFML-1.6-sdk-linux-64.tar.gz) = 12955697 bytes
-SHA1 (patch-include_SFML_Config.hpp) = 155b68310e449931f1fd767b9812244dbc98b5d1
-SHA1 (patch-include_SFML_Window_OpenGL.hpp) = 61669e6e76f24383860b0460f416d0446ba6686f
-SHA1 (patch-include_SFML_Window_WindowHandle.hpp) = fb08fe402751a1b8bbd5d3582240959db0fd5802
-SHA1 (patch-src_SFML_Makefile) = e1a17776b88228f2c0afbd1a0193be64e53fb2ff
-SHA1 (patch-src_SFML_Network_SelectorBase.cpp) = a88dda9668cd50246e3826821e7cd5fcf24ddeac
-SHA1 (patch-src_SFML_System_Platform.hpp) = b77aade1d5608a5f388043ff3f00a005f5c1bf27
-SHA1 (patch-src_SFML_Window_Joystick.hpp) = 0c9697036471adab66a74c9340c02f6e31e9258b
-SHA1 (patch-src_SFML_Window_Linux_Joystick.cpp) = 9688ebdbfd147d5452d2b023b729dd300c73a96b
-SHA1 (patch-src_SFML_Window_Linux_Joystick.hpp) = 7e24e297533efe5f26c30db1d4c819bdf8431230
-SHA1 (patch-src_SFML_Window_VideoModeSupport.hpp) = 7d7cdb099f057b30ca83d79a74a0efb74a6d2ba4
-SHA1 (patch-src_SFML_Window_WindowImpl.cpp) = 117a47e5be20ab6562d967eac37c66bc6f078669
+SHA1 (SFML-2.3.2-sources.zip) = 762f287d2347382bc036760dbfa0da73ff8c2a1d
+RMD160 (SFML-2.3.2-sources.zip) = 9745cb27914e3d29ca16d82414429d32e47be728
+SHA512 (SFML-2.3.2-sources.zip) = d35456f442c059f4438bf4ccc9fe363069d1f4caee3202a4ab2885b14a3db56c39f0fb6f03a8145c47d8ec71cf083710df87bac5b1f183430be6c6f66b2c477c
+Size (SFML-2.3.2-sources.zip) = 22586862 bytes
+SHA1 (patch-CMakeLists.txt) = 3b78c865d707f0e5c275c343ff461b3475f63e40
+SHA1 (patch-cmake_Config.cmake) = f9544531e9cd75ec6d244d2c5d87f5ed449eb8a9
+SHA1 (patch-include_SFML_Config.hpp) = 2ef6d01309fa039804dbaa73258e6eee4cf6a5f7
+SHA1 (patch-src_SFML_System_CMakeLists.txt) = 2cfc1f05b414105549769c7658699972c9e88f86
+SHA1 (patch-src_SFML_Window_CMakeLists.txt) = 40fdc7be081d94c19932a48efd32ad221fe1a940
+SHA1 (patch-src_SFML_Window_FreeBSD_JoystickImpl.hpp) = a4eb1a07b937d0ad7677cff53b946a8d5a6546ab
+SHA1 (patch-src_SFML_Window_GlContext.cpp) = 1419707c8b71e1bfdfd29f049b6aac418713ccd6
+SHA1 (patch-src_SFML_Window_InputImpl.hpp) = 3cee9ad1eb3efe282f1044dfd1815a1a17323a1d
+SHA1 (patch-src_SFML_Window_JoystickImpl.hpp) = 1940c192f030f08c99d7982933f0d44cd5e4cc49
+SHA1 (patch-src_SFML_Window_SensorImpl.hpp) = 0a8f349d1b57ff2fd980ee04ac66341c63eddf41
+SHA1 (patch-src_SFML_Window_WindowImpl.cpp) = c60bb2ca5b6444977be41ae04416442f4fdf7f46
diff --git a/sfml+/patches/patch-include_SFML_Config.hpp b/sfml+/patches/patch-include_SFML_Config.hpp
index 3bb7893..88a793f 100644
--- a/sfml+/patches/patch-include_SFML_Config.hpp
+++ b/sfml+/patches/patch-include_SFML_Config.hpp
@@ -1,18 +1,16 @@
-$NetBSD: patch-include_SFML_Config.hpp,v 1.1 2012/10/03 15:05:59 othyro Exp $
+$NetBSD$
-Adds NetBSD support.
-
---- include/SFML/Config.hpp.orig 2010-01-27 13:54:01.000000000 +0000
+--- include/SFML/Config.hpp.orig 2015-08-24 16:01:06.000000000 +0000
+++ include/SFML/Config.hpp
-@@ -54,6 +54,11 @@
- // FreeBSD
- #define SFML_SYSTEM_FREEBSD
-
-+#elif defined(__NetBSD__) || defined(__NetBSD_kernel__)
-+
-+ // NetBSD
-+ #define SFML_SYSTEM_NETBSD
-+
- #else
-
- // Unsupported system
+@@ -86,6 +86,11 @@
+ // FreeBSD
+ #define SFML_SYSTEM_FREEBSD
+
++ #elif defined(__NetBSD__)
++
++ // NetBSD
++ #define SFML_SYSTEM_NETBSD
++
+ #else
+
+ // Unsupported UNIX system
diff --git a/sfml+/patches/patch-include_SFML_Window_OpenGL.hpp b/sfml+/patches/patch-include_SFML_Window_OpenGL.hpp
deleted file mode 100644
index e5ff967..0000000
--- a/sfml+/patches/patch-include_SFML_Window_OpenGL.hpp
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-include_SFML_Window_OpenGL.hpp,v 1.1 2012/10/03 15:05:59 othyro Exp $
-
-Adds NetBSD support.
-
---- include/SFML/Window/OpenGL.hpp.orig 2010-01-27 13:53:54.000000000 +0000
-+++ include/SFML/Window/OpenGL.hpp
-@@ -42,7 +42,7 @@
- #include <GL/gl.h>
- #include <GL/glu.h>
-
--#elif defined(SFML_SYSTEM_LINUX) || defined(SFML_SYSTEM_FREEBSD)
-+#elif defined(SFML_SYSTEM_LINUX) || defined(SFML_SYSTEM_FREEBSD) || defined(SFML_SYSTEM_NETBSD)
-
- #include <GL/gl.h>
- #include <GL/glu.h>
diff --git a/sfml+/patches/patch-include_SFML_Window_WindowHandle.hpp b/sfml+/patches/patch-include_SFML_Window_WindowHandle.hpp
deleted file mode 100644
index bcd2624..0000000
--- a/sfml+/patches/patch-include_SFML_Window_WindowHandle.hpp
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-include_SFML_Window_WindowHandle.hpp,v 1.1 2012/10/03 15:05:59 othyro Exp $
-
-Adds NetBSD support.
-
---- include/SFML/Window/WindowHandle.hpp.orig 2010-01-27 13:53:54.000000000 +0000
-+++ include/SFML/Window/WindowHandle.hpp
-@@ -42,7 +42,7 @@ namespace sf
- // Windows defines a void* handle (HWND)
- typedef void* WindowHandle;
-
--#elif defined(SFML_SYSTEM_LINUX) || defined(SFML_SYSTEM_FREEBSD)
-+#elif defined(SFML_SYSTEM_LINUX) || defined(SFML_SYSTEM_FREEBSD) || defined(SFML_SYSTEM_NETBSD)
-
- // Unix - X11 defines an unsigned integer handle (Window)
- typedef unsigned long WindowHandle;
diff --git a/sfml+/patches/patch-src_SFML_Makefile b/sfml+/patches/patch-src_SFML_Makefile
deleted file mode 100644
index cd207b3..0000000
--- a/sfml+/patches/patch-src_SFML_Makefile
+++ /dev/null
@@ -1,50 +0,0 @@
-$NetBSD: patch-src_SFML_Makefile,v 1.1 2012/10/03 15:05:59 othyro Exp $
-
-Fixing MAKE_ENV, CFLAGS, and DESTDIR.
-
---- src/SFML/Makefile.orig 2010-01-27 14:00:37.000000000 +0000
-+++ src/SFML/Makefile
-@@ -1,5 +1,8 @@
--export DEBUGBUILD = no
--export STATIC = no
-+DEBUGBUILD ?= no
-+STATIC ?= no
-+LINKFLAGS = ${LDFLAGS}
-+export DEBUGBUILD
-+export STATIC
-
- ifeq ($(DEBUGBUILD), yes)
- DEBUGFLAGS = -g -DDEBUG
-@@ -9,15 +12,15 @@ endif
-
- ifeq ($(STATIC), no)
- BUILDFLAGS = -fPIC
-- LINKFLAGS = -shared
-+ LINKFLAGS := $(LINKFLAGS) -shared
- else
- BUILDFLAGS =
-- LINKFLAGS =
-+ LINKFLAGS := $(LINKFLAGS)
- endif
-
- export CC = gcc
- export CPP = g++
--export CFLAGS = -W -Wall -pedantic -I../../../include -I../../ $(DEBUGFLAGS) $(BUILDFLAGS)
-+export CFLAGS = -W -Wall -pedantic -I../../../include -I../../ $(DEBUGFLAGS) $(BUILDFLAGS) ${CPPFLAGS}
- export CFLAGSEXT = -I../../../include -I../.. $(DEBUGFLAGS) $(BUILDFLAGS)
- export LDFLAGS = $(LINKFLAGS)
- export LIBPATH = ../../../lib
-@@ -27,9 +30,10 @@ export LN = ln
- export LNFLAGS = -s -f
- export AR = ar
- export ARFLAGS = rcs
--export DESTDIR = /usr/local
--export DESTLIBDIR = $(DESTDIR)/lib
--export DESTINCDIR = $(DESTDIR)/include
-+DESTDIR ?= /usr/local
-+export DESTDIR
-+export DESTLIBDIR = $(DESTDIR)${PREFIX}/lib
-+export DESTINCDIR = $(DESTDIR)${PREFIX}/include
-
- all: sfml-system sfml-window sfml-network sfml-graphics sfml-audio
-
diff --git a/sfml+/patches/patch-src_SFML_Network_SelectorBase.cpp b/sfml+/patches/patch-src_SFML_Network_SelectorBase.cpp
deleted file mode 100644
index be6070f..0000000
--- a/sfml+/patches/patch-src_SFML_Network_SelectorBase.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-src_SFML_Network_SelectorBase.cpp,v 1.1 2012/10/03 15:06:00 othyro Exp $
-
-Needs sys/time.h for timeval and select.
-
---- src/SFML/Network/SelectorBase.cpp.orig 2010-01-27 14:00:37.000000000 +0000
-+++ src/SFML/Network/SelectorBase.cpp
-@@ -29,6 +29,7 @@
- ////////////////////////////////////////////////////////////
- // Headers
- ////////////////////////////////////////////////////////////
-+#include <sys/time.h>
- #include <SFML/Network/SelectorBase.hpp>
-
-
diff --git a/sfml+/patches/patch-src_SFML_System_Platform.hpp b/sfml+/patches/patch-src_SFML_System_Platform.hpp
deleted file mode 100644
index a9f7d60..0000000
--- a/sfml+/patches/patch-src_SFML_System_Platform.hpp
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-src_SFML_System_Platform.hpp,v 1.1 2012/10/03 15:06:00 othyro Exp $
-
-Adds NetBSD support.
-
---- src/SFML/System/Platform.hpp.orig 2010-01-27 14:00:23.000000000 +0000
-+++ src/SFML/System/Platform.hpp
-@@ -35,7 +35,7 @@
-
- #include <SFML/System/Win32/Platform.hpp>
-
--#elif defined(SFML_SYSTEM_LINUX) || defined(SFML_SYSTEM_MACOS) || defined(SFML_SYSTEM_FREEBSD)
-+#elif defined(SFML_SYSTEM_LINUX) || defined(SFML_SYSTEM_MACOS) || defined(SFML_SYSTEM_FREEBSD) || defined(SFML_SYSTEM_NETBSD)
-
- #include <SFML/System/Unix/Platform.hpp>
-
diff --git a/sfml+/patches/patch-src_SFML_Window_Joystick.hpp b/sfml+/patches/patch-src_SFML_Window_Joystick.hpp
deleted file mode 100644
index 9ec4632..0000000
--- a/sfml+/patches/patch-src_SFML_Window_Joystick.hpp
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-src_SFML_Window_Joystick.hpp,v 1.1 2012/10/03 15:06:00 othyro Exp $
-
-Adds NetBSD support.
-
---- src/SFML/Window/Joystick.hpp.orig 2010-01-27 14:00:37.000000000 +0000
-+++ src/SFML/Window/Joystick.hpp
-@@ -66,7 +66,7 @@ struct JoystickState
-
- #include <SFML/Window/Win32/Joystick.hpp>
-
--#elif defined(SFML_SYSTEM_LINUX) || defined(SFML_SYSTEM_FREEBSD)
-+#elif defined(SFML_SYSTEM_LINUX) || defined(SFML_SYSTEM_FREEBSD) || defined(SFML_SYSTEM_NETBSD)
-
- #include <SFML/Window/Linux/Joystick.hpp>
-
diff --git a/sfml+/patches/patch-src_SFML_Window_Linux_Joystick.cpp b/sfml+/patches/patch-src_SFML_Window_Linux_Joystick.cpp
deleted file mode 100644
index 05373c4..0000000
--- a/sfml+/patches/patch-src_SFML_Window_Linux_Joystick.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-src_SFML_Window_Linux_Joystick.cpp,v 1.1 2012/10/03 15:06:00 othyro Exp $
-
-Adds NetBSD support.
-
---- src/SFML/Window/Linux/Joystick.cpp.orig 2010-01-27 14:00:27.000000000 +0000
-+++ src/SFML/Window/Linux/Joystick.cpp
-@@ -175,7 +175,7 @@ unsigned int Joystick::GetButtonsCount()
- }
-
-
--#elif defined(SFML_SYSTEM_FREEBSD)
-+#elif defined(SFML_SYSTEM_FREEBSD) || defined(SFML_SYSTEM_NETBSD)
-
-
- ////////////////////////////////////////////////////////////
-@@ -212,7 +212,7 @@ unsigned int Joystick::GetButtonsCount()
- return 0;
- }
-
--#endif // defined(SFML_SYSTEM_FREEBSD)
-+#endif // defined(SFML_SYSTEM_FREEBSD) || defined(SFML_SYSTEM_NETBSD)
-
- } // namespace priv
-
diff --git a/sfml+/patches/patch-src_SFML_Window_Linux_Joystick.hpp b/sfml+/patches/patch-src_SFML_Window_Linux_Joystick.hpp
deleted file mode 100644
index 63e0551..0000000
--- a/sfml+/patches/patch-src_SFML_Window_Linux_Joystick.hpp
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-src_SFML_Window_Linux_Joystick.hpp,v 1.1 2012/10/03 15:06:00 othyro Exp $
-
-Adds NetBSD support.
-
---- src/SFML/Window/Linux/Joystick.hpp.orig 2010-03-18 13:15:05.000000000 +0000
-+++ src/SFML/Window/Linux/Joystick.hpp
-@@ -34,6 +34,9 @@
- #elif defined(SFML_SYSTEM_FREEBSD)
- // #include <sys/joystick.h> ?
- #define ABS_MAX 1
-+#elif defined(SFML_SYSTEM_NETBSD)
-+ #include <sys/joystick.h>
-+ #define ABS_MAX 1
- #endif
-
-
diff --git a/sfml+/patches/patch-src_SFML_Window_VideoModeSupport.hpp b/sfml+/patches/patch-src_SFML_Window_VideoModeSupport.hpp
deleted file mode 100644
index 527d2f2..0000000
--- a/sfml+/patches/patch-src_SFML_Window_VideoModeSupport.hpp
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-src_SFML_Window_VideoModeSupport.hpp,v 1.1 2012/10/03 15:06:00 othyro Exp $
-
-Adds NetBSD support.
-
---- src/SFML/Window/VideoModeSupport.hpp.orig 2010-01-27 14:00:37.000000000 +0000
-+++ src/SFML/Window/VideoModeSupport.hpp
-@@ -35,7 +35,7 @@
-
- #include <SFML/Window/Win32/VideoModeSupport.hpp>
-
--#elif defined(SFML_SYSTEM_LINUX) || defined(SFML_SYSTEM_FREEBSD)
-+#elif defined(SFML_SYSTEM_LINUX) || defined(SFML_SYSTEM_FREEBSD) || defined(SFML_SYSTEM_NETBSD)
-
- #include <SFML/Window/Linux/VideoModeSupport.hpp>
-
diff --git a/sfml+/patches/patch-src_SFML_Window_WindowImpl.cpp b/sfml+/patches/patch-src_SFML_Window_WindowImpl.cpp
deleted file mode 100644
index 389287f..0000000
--- a/sfml+/patches/patch-src_SFML_Window_WindowImpl.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-src_SFML_Window_WindowImpl.cpp,v 1.1 2012/10/03 15:06:00 othyro Exp $
-
-Adds NetBSD support.
-
---- src/SFML/Window/WindowImpl.cpp.orig 2010-01-27 14:00:37.000000000 +0000
-+++ src/SFML/Window/WindowImpl.cpp
-@@ -36,7 +36,7 @@
- #include <SFML/Window/Win32/WindowImplWin32.hpp>
- typedef sf::priv::WindowImplWin32 WindowImplType;
-
--#elif defined(SFML_SYSTEM_LINUX) || defined(SFML_SYSTEM_FREEBSD)
-+#elif defined(SFML_SYSTEM_LINUX) || defined(SFML_SYSTEM_FREEBSD) || defined(SFML_SYSTEM_NETBSD)
-
- #include <SFML/Window/Linux/WindowImplX11.hpp>
- typedef sf::priv::WindowImplX11 WindowImplType;
Home |
Main Index |
Thread Index |
Old Index