Date: Fri, 22 Aug 2014 10:02:21 +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: r365631 - in head/devel/sfml: . files Message-ID: <201408221002.s7MA2Lj5047530@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: amdmi3 Date: Fri Aug 22 10:02:21 2014 New Revision: 365631 URL: http://svnweb.freebsd.org/changeset/ports/365631 QAT: https://qat.redports.org/buildarchive/r365631/ Log: - Update to 2.1 Added: head/devel/sfml/files/patch-CMakeLists.txt (contents, props changed) head/devel/sfml/files/patch-src-SFML-Window-Linux-JoystickImpl.cpp (contents, props changed) head/devel/sfml/files/patch-src-SFML-Window-Linux-WindowImplX11.cpp (contents, props changed) Deleted: head/devel/sfml/files/patch-src-SFML-Audio-Makefile head/devel/sfml/files/patch-src-SFML-Graphics-Makefile head/devel/sfml/files/patch-src-SFML-Makefile head/devel/sfml/files/patch-src-SFML-Network-Makefile head/devel/sfml/files/patch-src-SFML-System-Makefile head/devel/sfml/files/patch-src-SFML-Window-Makefile Modified: head/devel/sfml/Makefile head/devel/sfml/distinfo head/devel/sfml/pkg-plist Modified: head/devel/sfml/Makefile ============================================================================== --- head/devel/sfml/Makefile Fri Aug 22 10:01:59 2014 (r365630) +++ head/devel/sfml/Makefile Fri Aug 22 10:02:21 2014 (r365631) @@ -2,44 +2,33 @@ # $FreeBSD$ PORTNAME= sfml -PORTVERSION= 1.6 -PORTREVISION= 3 +PORTVERSION= 2.1 CATEGORIES= devel -MASTER_SITES= SF -DISTNAME= SFML-${PORTVERSION}-sdk-linux-32 +MASTER_SITES= http://www.sfml-dev.org/download/sfml/${PORTVERSION}/ +DISTNAME= SFML-${PORTVERSION}-sources MAINTAINER= amdmi3@FreeBSD.org COMMENT= Simple and Fast Multimedia Library LIB_DEPENDS= libsndfile.so:${PORTSDIR}/audio/libsndfile \ libjpeg.so:${PORTSDIR}/graphics/jpeg \ - libpng.so:${PORTSDIR}/graphics/png \ - libfreetype.so:${PORTSDIR}/print/freetype2 + libfreetype.so:${PORTSDIR}/print/freetype2 \ + libGLEW.so:${PORTSDIR}/graphics/glew -USES= gmake openal:al pkgconfig dos2unix -DOS2UNIX_GLOB= Makefile +USES= cmake zip:infozip openal:al dos2unix +DOS2UNIX_FILES= CMakeLists.txt USE_XORG= x11 xrandr -USE_GL= gl glu +USE_GL= gl USE_LDCONFIG= yes -DESTDIRNAME= STAGEDIR WRKSRC= ${WRKDIR}/SFML-${PORTVERSION} -PORTDOCS= * +DATADIR= ${PREFIX}/share/SFML +PORTDATA= * -PORTSCOUT= limit:[^c]$$ +OPTIONS_DEFINE= DOXYGEN -OPTIONS_DEFINE= DOCS - -post-extract: - @${RM} -f ${WRKSRC}/lib/* - @${FIND} ${WRKSRC}/samples/bin/ -type f -maxdepth 1 -delete - -post-install: -.for lib in audio graphics network system window - @${LN} -s libsfml-${lib}.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/libsfml-${lib}.so.${PORTVERSION:C/^([0-9]).*/\1/} -.endfor - ${MKDIR} ${STAGEDIR}${DOCSDIR} - cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}/ +DOXYGEN_CMAKE_ON= -DSFML_BUILD_DOC:BOOL=YES +DOXYGEN_BUILD_DEPENDS= doxygen:${PORTSDIR}/devel/doxygen .include <bsd.port.mk> Modified: head/devel/sfml/distinfo ============================================================================== --- head/devel/sfml/distinfo Fri Aug 22 10:01:59 2014 (r365630) +++ head/devel/sfml/distinfo Fri Aug 22 10:02:21 2014 (r365631) @@ -1,2 +1,2 @@ -SHA256 (SFML-1.6-sdk-linux-32.tar.gz) = b1c18f9b99c54ebb4cd433792f33ed2b85c846cca28eb871a12b3191dc1532f8 -SIZE (SFML-1.6-sdk-linux-32.tar.gz) = 12937755 +SHA256 (SFML-2.1-sources.zip) = 5f46d7748223be3f0c6a9fcf18c0016d227f7b1903cdbcd85f61ddbc82ef95bf +SIZE (SFML-2.1-sources.zip) = 9728420 Added: head/devel/sfml/files/patch-CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/sfml/files/patch-CMakeLists.txt Fri Aug 22 10:02:21 2014 (r365631) @@ -0,0 +1,11 @@ +--- CMakeLists.txt.orig 2013-07-21 11:30:08.000000000 +0400 ++++ CMakeLists.txt 2014-08-15 18:24:11.785377335 +0400 +@@ -113,7 +113,7 @@ + "tools/pkg-config/sfml-${sfml_module}.pc" + @ONLY) + INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/tools/pkg-config/sfml-${sfml_module}.pc" +- DESTINATION "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/pkgconfig") ++ DESTINATION "${CMAKE_INSTALL_PREFIX}/libdata/pkgconfig") + endforeach() + endif() + else() Added: head/devel/sfml/files/patch-src-SFML-Window-Linux-JoystickImpl.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/sfml/files/patch-src-SFML-Window-Linux-JoystickImpl.cpp Fri Aug 22 10:02:21 2014 (r365631) @@ -0,0 +1,209 @@ +--- src/SFML/Window/Linux/JoystickImpl.cpp.orig 2013-07-21 11:30:08.000000000 +0400 ++++ src/SFML/Window/Linux/JoystickImpl.cpp 2014-08-15 18:39:52.598031897 +0400 +@@ -27,7 +27,6 @@ + //////////////////////////////////////////////////////////// + #include <SFML/Window/JoystickImpl.hpp> + #include <SFML/System/Err.hpp> +-#include <sys/inotify.h> + #include <sys/stat.h> + #include <unistd.h> + #include <errno.h> +@@ -45,7 +44,7 @@ + for (unsigned int i = 0; i < sf::Joystick::Count; ++i) + { + char name[32]; +- std::snprintf(name, sizeof(name), "/dev/input/js%u", i); ++ ::snprintf(name, sizeof(name), "/dev/input/js%u", i); + struct stat info; + plugged[i] = (stat(name, &info) == 0); + } +@@ -70,185 +69,46 @@ + //////////////////////////////////////////////////////////// + void JoystickImpl::initialize() + { +- // Reset the array of plugged joysticks +- std::fill(plugged, plugged + Joystick::Count, false); +- +- // Create the inotify instance +- notifyFd = inotify_init(); +- if (notifyFd < 0) +- { +- err() << "Failed to initialize inotify, joystick connections and disconnections won't be notified" << std::endl; +- return; +- } +- +- // Watch nodes created and deleted in the /dev/input directory +- inputFd = inotify_add_watch(notifyFd, "/dev/input", IN_CREATE | IN_DELETE); +- if (inputFd < 0) +- { +- err() << "Failed to initialize inotify, joystick connections and disconnections won't be notified" << std::endl; +- return; +- } +- +- // Do an initial scan +- updatePluggedList(); + } + + + //////////////////////////////////////////////////////////// + void JoystickImpl::cleanup() + { +- // Stop watching the /dev/input directory +- if (inputFd >= 0) +- inotify_rm_watch(notifyFd, inputFd); +- +- // Close the inotify file descriptor +- if (inputFd >= 0) +- ::close(notifyFd); + } + + + //////////////////////////////////////////////////////////// + bool JoystickImpl::isConnected(unsigned int index) + { +- // First check if new joysticks were added/removed since last update +- if (canRead(notifyFd)) +- { +- // Don't bother decomposing and interpreting the filename, just do a full scan +- updatePluggedList(); +- +- // Flush all the pending events +- while (canRead(notifyFd)) +- { +- char buffer[128]; +- read(notifyFd, buffer, sizeof(buffer)); +- } +- } +- +- // Then check if the joystick is connected +- return plugged[index]; ++ return false; + } + + + //////////////////////////////////////////////////////////// + bool JoystickImpl::open(unsigned int index) + { +- if (plugged[index]) +- { +- char name[32]; +- std::snprintf(name, sizeof(name), "/dev/input/js%u", index); +- +- // Open the joystick's file descriptor (read-only and non-blocking) +- m_file = ::open(name, O_RDONLY | O_NONBLOCK); +- if (m_file >= 0) +- { +- // Retrieve the axes mapping +- ioctl(m_file, JSIOCGAXMAP, m_mapping); +- +- // Reset the joystick state +- m_state = JoystickState(); +- +- return true; +- } +- else +- { +- return false; +- } +- } +- else +- { +- return false; +- } ++ return false; + } + + + //////////////////////////////////////////////////////////// + void JoystickImpl::close() + { +- ::close(m_file); + } + + + //////////////////////////////////////////////////////////// + JoystickCaps JoystickImpl::getCapabilities() const + { +- JoystickCaps caps; +- +- // Get the number of buttons +- char buttonCount; +- ioctl(m_file, JSIOCGBUTTONS, &buttonCount); +- caps.buttonCount = buttonCount; +- if (caps.buttonCount > Joystick::ButtonCount) +- caps.buttonCount = Joystick::ButtonCount; +- +- // Get the supported axes +- char axesCount; +- ioctl(m_file, JSIOCGAXES, &axesCount); +- for (int i = 0; i < axesCount; ++i) +- { +- switch (m_mapping[i]) +- { +- case ABS_X : caps.axes[Joystick::X] = true; break; +- case ABS_Y : caps.axes[Joystick::Y] = true; break; +- case ABS_Z : +- case ABS_THROTTLE : caps.axes[Joystick::Z] = true; break; +- case ABS_RZ: +- case ABS_RUDDER: caps.axes[Joystick::R] = true; break; +- case ABS_RX : caps.axes[Joystick::U] = true; break; +- case ABS_RY : caps.axes[Joystick::V] = true; break; +- case ABS_HAT0X : caps.axes[Joystick::PovX] = true; break; +- case ABS_HAT0Y : caps.axes[Joystick::PovY] = true; break; +- default : break; +- } +- } +- +- return caps; ++ return JoystickCaps(); + } + + + //////////////////////////////////////////////////////////// + JoystickState JoystickImpl::JoystickImpl::update() + { +- // pop events from the joystick file +- js_event joyState; +- while (read(m_file, &joyState, sizeof(joyState)) > 0) +- { +- switch (joyState.type & ~JS_EVENT_INIT) +- { +- // An axis was moved +- case JS_EVENT_AXIS : +- { +- float value = joyState.value * 100.f / 32767.f; +- switch (m_mapping[joyState.number]) +- { +- case ABS_X : m_state.axes[Joystick::X] = value; break; +- case ABS_Y : m_state.axes[Joystick::Y] = value; break; +- case ABS_Z : +- case ABS_THROTTLE : m_state.axes[Joystick::Z] = value; break; +- case ABS_RZ: +- case ABS_RUDDER: m_state.axes[Joystick::R] = value; break; +- case ABS_RX : m_state.axes[Joystick::U] = value; break; +- case ABS_RY : m_state.axes[Joystick::V] = value; break; +- case ABS_HAT0X : m_state.axes[Joystick::PovX] = value; break; +- case ABS_HAT0Y : m_state.axes[Joystick::PovY] = value; break; +- default : break; +- } +- break; +- } +- +- // A button was pressed +- case JS_EVENT_BUTTON : +- { +- if (joyState.number < Joystick::ButtonCount) +- m_state.buttons[joyState.number] = (joyState.value != 0); +- break; +- } +- } +- } +- +- // Check the connection state of the joystick (read() fails with an error != EGAIN if it's no longer connected) +- m_state.connected = (errno == EAGAIN); +- +- return m_state; ++ return JoystickState(); + } + + } // namespace priv Added: head/devel/sfml/files/patch-src-SFML-Window-Linux-WindowImplX11.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/sfml/files/patch-src-SFML-Window-Linux-WindowImplX11.cpp Fri Aug 22 10:02:21 2014 (r365631) @@ -0,0 +1,10 @@ +--- src/SFML/Window/Linux/WindowImplX11.cpp.orig 2014-04-25 17:24:48.844984881 +0400 ++++ src/SFML/Window/Linux/WindowImplX11.cpp 2014-04-25 17:24:55.854171823 +0400 +@@ -35,6 +35,7 @@ + #include <X11/keysym.h> + #include <X11/extensions/Xrandr.h> + #include <unistd.h> ++#include <libgen.h> + #include <cstring> + #include <sstream> + #include <vector> Modified: head/devel/sfml/pkg-plist ============================================================================== --- head/devel/sfml/pkg-plist Fri Aug 22 10:01:59 2014 (r365630) +++ head/devel/sfml/pkg-plist Fri Aug 22 10:02:21 2014 (r365631) @@ -1,98 +1,114 @@ include/SFML/Audio.hpp -include/SFML/Audio/AudioResource.hpp +include/SFML/Audio/Export.hpp include/SFML/Audio/Listener.hpp include/SFML/Audio/Music.hpp include/SFML/Audio/Sound.hpp include/SFML/Audio/SoundBuffer.hpp include/SFML/Audio/SoundBufferRecorder.hpp include/SFML/Audio/SoundRecorder.hpp +include/SFML/Audio/SoundSource.hpp include/SFML/Audio/SoundStream.hpp include/SFML/Config.hpp include/SFML/Graphics.hpp +include/SFML/Graphics/BlendMode.hpp +include/SFML/Graphics/CircleShape.hpp include/SFML/Graphics/Color.hpp +include/SFML/Graphics/ConvexShape.hpp include/SFML/Graphics/Drawable.hpp +include/SFML/Graphics/Export.hpp include/SFML/Graphics/Font.hpp include/SFML/Graphics/Glyph.hpp include/SFML/Graphics/Image.hpp -include/SFML/Graphics/Matrix3.hpp -include/SFML/Graphics/Matrix3.inl -include/SFML/Graphics/PostFX.hpp +include/SFML/Graphics/PrimitiveType.hpp include/SFML/Graphics/Rect.hpp include/SFML/Graphics/Rect.inl +include/SFML/Graphics/RectangleShape.hpp +include/SFML/Graphics/RenderStates.hpp include/SFML/Graphics/RenderTarget.hpp +include/SFML/Graphics/RenderTexture.hpp include/SFML/Graphics/RenderWindow.hpp +include/SFML/Graphics/Shader.hpp include/SFML/Graphics/Shape.hpp include/SFML/Graphics/Sprite.hpp -include/SFML/Graphics/String.hpp +include/SFML/Graphics/Text.hpp +include/SFML/Graphics/Texture.hpp +include/SFML/Graphics/Transform.hpp +include/SFML/Graphics/Transformable.hpp +include/SFML/Graphics/Vertex.hpp +include/SFML/Graphics/VertexArray.hpp include/SFML/Graphics/View.hpp include/SFML/Network.hpp +include/SFML/Network/Export.hpp include/SFML/Network/Ftp.hpp include/SFML/Network/Http.hpp -include/SFML/Network/IPAddress.hpp +include/SFML/Network/IpAddress.hpp include/SFML/Network/Packet.hpp -include/SFML/Network/Selector.hpp -include/SFML/Network/Selector.inl -include/SFML/Network/SelectorBase.hpp -include/SFML/Network/SocketHelper.hpp -include/SFML/Network/SocketTCP.hpp -include/SFML/Network/SocketUDP.hpp -include/SFML/Network/Sockets.hpp -include/SFML/Network/Unix/SocketHelper.hpp -include/SFML/Network/Win32/SocketHelper.hpp +include/SFML/Network/Socket.hpp +include/SFML/Network/SocketHandle.hpp +include/SFML/Network/SocketSelector.hpp +include/SFML/Network/TcpListener.hpp +include/SFML/Network/TcpSocket.hpp +include/SFML/Network/UdpSocket.hpp +include/SFML/OpenGL.hpp include/SFML/System.hpp include/SFML/System/Clock.hpp +include/SFML/System/Err.hpp +include/SFML/System/Export.hpp +include/SFML/System/InputStream.hpp include/SFML/System/Lock.hpp include/SFML/System/Mutex.hpp include/SFML/System/NonCopyable.hpp -include/SFML/System/Randomizer.hpp -include/SFML/System/Resource.hpp -include/SFML/System/Resource.inl -include/SFML/System/ResourcePtr.inl include/SFML/System/Sleep.hpp +include/SFML/System/String.hpp include/SFML/System/Thread.hpp -include/SFML/System/Unicode.hpp -include/SFML/System/Unicode.inl -include/SFML/System/Unix/Mutex.hpp -include/SFML/System/Unix/Thread.hpp +include/SFML/System/Thread.inl +include/SFML/System/ThreadLocal.hpp +include/SFML/System/ThreadLocalPtr.hpp +include/SFML/System/ThreadLocalPtr.inl +include/SFML/System/Time.hpp +include/SFML/System/Utf.hpp +include/SFML/System/Utf.inl include/SFML/System/Vector2.hpp include/SFML/System/Vector2.inl include/SFML/System/Vector3.hpp include/SFML/System/Vector3.inl -include/SFML/System/Win32/Mutex.hpp -include/SFML/System/Win32/Thread.hpp include/SFML/Window.hpp include/SFML/Window/Context.hpp +include/SFML/Window/ContextSettings.hpp include/SFML/Window/Event.hpp -include/SFML/Window/Input.hpp -include/SFML/Window/OpenGL.hpp +include/SFML/Window/Export.hpp +include/SFML/Window/GlResource.hpp +include/SFML/Window/Joystick.hpp +include/SFML/Window/Keyboard.hpp +include/SFML/Window/Mouse.hpp include/SFML/Window/VideoMode.hpp include/SFML/Window/Window.hpp include/SFML/Window/WindowHandle.hpp -include/SFML/Window/WindowListener.hpp -include/SFML/Window/WindowSettings.hpp include/SFML/Window/WindowStyle.hpp lib/libsfml-audio.so -lib/libsfml-audio.so.1 -lib/libsfml-audio.so.1.6 +lib/libsfml-audio.so.2 +lib/libsfml-audio.so.2.1 lib/libsfml-graphics.so -lib/libsfml-graphics.so.1 -lib/libsfml-graphics.so.1.6 +lib/libsfml-graphics.so.2 +lib/libsfml-graphics.so.2.1 lib/libsfml-network.so -lib/libsfml-network.so.1 -lib/libsfml-network.so.1.6 +lib/libsfml-network.so.2 +lib/libsfml-network.so.2.1 lib/libsfml-system.so -lib/libsfml-system.so.1 -lib/libsfml-system.so.1.6 +lib/libsfml-system.so.2 +lib/libsfml-system.so.2.1 lib/libsfml-window.so -lib/libsfml-window.so.1 -lib/libsfml-window.so.1.6 -@dirrm include/SFML/Window -@dirrm include/SFML/System/Win32 -@dirrm include/SFML/System/Unix -@dirrm include/SFML/System -@dirrm include/SFML/Network/Win32 -@dirrm include/SFML/Network/Unix -@dirrm include/SFML/Network -@dirrm include/SFML/Graphics +lib/libsfml-window.so.2 +lib/libsfml-window.so.2.1 +libdata/pkgconfig/sfml-all.pc +libdata/pkgconfig/sfml-audio.pc +libdata/pkgconfig/sfml-graphics.pc +libdata/pkgconfig/sfml-network.pc +libdata/pkgconfig/sfml-system.pc +libdata/pkgconfig/sfml-window.pc @dirrm include/SFML/Audio +@dirrm include/SFML/Graphics +@dirrm include/SFML/Network +@dirrm include/SFML/System +@dirrm include/SFML/Window @dirrm include/SFML
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201408221002.s7MA2Lj5047530>