diff --git a/devel/sfml/Makefile b/devel/sfml/Makefile index c028ea386436..ce6d383a8918 100644 --- a/devel/sfml/Makefile +++ b/devel/sfml/Makefile @@ -1,33 +1,41 @@ # Created by: Dmitry Marakasov # $FreeBSD$ PORTNAME= sfml -PORTVERSION= 2.1 -PORTREVISION= 1 +PORTVERSION= 2.4.0 CATEGORIES= devel 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:audio/libsndfile \ - libfreetype.so:print/freetype2 +LICENSE= ZLIB +LICENSE_FILE= ${WRKSRC}/license.txt + +LIB_DEPENDS= libFLAC.so:audio/flac \ + libfreetype.so:print/freetype2 \ + libogg.so:audio/libogg \ + libvorbis.so:audio/libvorbis \ + libxcb-image.so:x11/xcb-util-image + +BROKEN_FreeBSD_9= does not build USES= cmake dos2unix jpeg openal:al zip:infozip +CMAKE_ARGS= -DSFML_INSTALL_PKGCONFIG_FILES=ON DOS2UNIX_FILES= CMakeLists.txt -USE_XORG= x11 xrandr -USE_GL= gl glew +USE_XORG= x11 xcb +USE_GL= gl USE_LDCONFIG= yes WRKSRC= ${WRKDIR}/SFML-${PORTVERSION} DATADIR= ${PREFIX}/share/SFML PORTDATA= * OPTIONS_DEFINE= DOXYGEN DOXYGEN_CMAKE_ON= -DSFML_BUILD_DOC:BOOL=YES DOXYGEN_BUILD_DEPENDS= doxygen:devel/doxygen .include diff --git a/devel/sfml/distinfo b/devel/sfml/distinfo index f38c0cbacae4..50fe0ae90ac5 100644 --- a/devel/sfml/distinfo +++ b/devel/sfml/distinfo @@ -1,2 +1,3 @@ -SHA256 (SFML-2.1-sources.zip) = 5f46d7748223be3f0c6a9fcf18c0016d227f7b1903cdbcd85f61ddbc82ef95bf -SIZE (SFML-2.1-sources.zip) = 9728420 +TIMESTAMP = 1474077496 +SHA256 (SFML-2.4.0-sources.zip) = 868a1a1e43a7ee40c1a90efcbcea061b6f0a6ed129075d9a8f19c8c69e644b0f +SIZE (SFML-2.4.0-sources.zip) = 24965927 diff --git a/devel/sfml/files/patch-CMakeLists.txt b/devel/sfml/files/patch-CMakeLists.txt deleted file mode 100644 index ceb8e86302a4..000000000000 --- a/devel/sfml/files/patch-CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ ---- 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() diff --git a/devel/sfml/files/patch-src-SFML-Window-Linux-JoystickImpl.cpp b/devel/sfml/files/patch-src-SFML-Window-Linux-JoystickImpl.cpp deleted file mode 100644 index 5a43c1823a54..000000000000 --- a/devel/sfml/files/patch-src-SFML-Window-Linux-JoystickImpl.cpp +++ /dev/null @@ -1,209 +0,0 @@ ---- 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 - #include --#include - #include - #include - #include -@@ -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 diff --git a/devel/sfml/files/patch-src-SFML-Window-Linux-WindowImplX11.cpp b/devel/sfml/files/patch-src-SFML-Window-Linux-WindowImplX11.cpp deleted file mode 100644 index 1c6fadeba753..000000000000 --- a/devel/sfml/files/patch-src-SFML-Window-Linux-WindowImplX11.cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- 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 - #include - #include -+#include - #include - #include - #include diff --git a/devel/sfml/pkg-descr b/devel/sfml/pkg-descr index dba2125b083c..72613fc9d778 100644 --- a/devel/sfml/pkg-descr +++ b/devel/sfml/pkg-descr @@ -1,9 +1,9 @@ SFML is a portable and easy to use multimedia API written in C++. You can see it as a modern, object-oriented alternative to SDL. SFML is composed of several packages to perfectly suit your needs. You can use SFML as a minimal windowing system to interface with OpenGL, or as a fully-featured multimedia library for building games or interactive programs. -WWW: http://www.sfml-dev.org/index.php +WWW: http://www.sfml-dev.org/ diff --git a/devel/sfml/pkg-plist b/devel/sfml/pkg-plist index 9c49e4b0b894..e82a156c1a1a 100644 --- a/devel/sfml/pkg-plist +++ b/devel/sfml/pkg-plist @@ -1,108 +1,124 @@ include/SFML/Audio.hpp +include/SFML/Audio/AlResource.hpp include/SFML/Audio/Export.hpp +include/SFML/Audio/InputSoundFile.hpp include/SFML/Audio/Listener.hpp include/SFML/Audio/Music.hpp +include/SFML/Audio/OutputSoundFile.hpp include/SFML/Audio/Sound.hpp include/SFML/Audio/SoundBuffer.hpp include/SFML/Audio/SoundBufferRecorder.hpp +include/SFML/Audio/SoundFileFactory.hpp +include/SFML/Audio/SoundFileFactory.inl +include/SFML/Audio/SoundFileReader.hpp +include/SFML/Audio/SoundFileWriter.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/Glsl.hpp +include/SFML/Graphics/Glsl.inl include/SFML/Graphics/Glyph.hpp include/SFML/Graphics/Image.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/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/Main.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/Packet.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/FileInputStream.hpp include/SFML/System/InputStream.hpp include/SFML/System/Lock.hpp +include/SFML/System/MemoryInputStream.hpp include/SFML/System/Mutex.hpp +include/SFML/System/NativeActivity.hpp include/SFML/System/NonCopyable.hpp include/SFML/System/Sleep.hpp include/SFML/System/String.hpp +include/SFML/System/String.inl include/SFML/System/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/Window.hpp include/SFML/Window/Context.hpp include/SFML/Window/ContextSettings.hpp include/SFML/Window/Event.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/Sensor.hpp +include/SFML/Window/Touch.hpp include/SFML/Window/VideoMode.hpp include/SFML/Window/Window.hpp include/SFML/Window/WindowHandle.hpp include/SFML/Window/WindowStyle.hpp lib/libsfml-audio.so -lib/libsfml-audio.so.2 -lib/libsfml-audio.so.2.1 +lib/libsfml-audio.so.2.4 +lib/libsfml-audio.so.2.4.0 lib/libsfml-graphics.so -lib/libsfml-graphics.so.2 -lib/libsfml-graphics.so.2.1 +lib/libsfml-graphics.so.2.4 +lib/libsfml-graphics.so.2.4.0 lib/libsfml-network.so -lib/libsfml-network.so.2 -lib/libsfml-network.so.2.1 +lib/libsfml-network.so.2.4 +lib/libsfml-network.so.2.4.0 lib/libsfml-system.so -lib/libsfml-system.so.2 -lib/libsfml-system.so.2.1 +lib/libsfml-system.so.2.4 +lib/libsfml-system.so.2.4.0 lib/libsfml-window.so -lib/libsfml-window.so.2 -lib/libsfml-window.so.2.1 +lib/libsfml-window.so.2.4 +lib/libsfml-window.so.2.4.0 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 diff --git a/emulators/dolphin-emu/Makefile b/emulators/dolphin-emu/Makefile index f453a98f37ab..42b3a36b18ed 100644 --- a/emulators/dolphin-emu/Makefile +++ b/emulators/dolphin-emu/Makefile @@ -1,99 +1,99 @@ # Created by: Ganael Laplanche # $FreeBSD$ PORTNAME= dolphin-emu DISTVERSION= 5.0-rc -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= emulators MAINTAINER= martymac@FreeBSD.org COMMENT= Gamecube and Wii Emulator LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/license.txt # Notes on dependencies: # - keep enet from externals as Dolphin's version diverges # - xxhash and SOIL are not (yet) in ports LIB_DEPENDS= libfreetype.so:print/freetype2 \ liblzo2.so:archivers/lzo2 \ libpng.so:graphics/png \ libSoundTouch.so:audio/soundtouch \ libmbedtls.so.9:security/polarssl13 \ libsfml-system.so:devel/sfml USE_GITHUB= yes GH_PROJECT= dolphin USE_SDL= sdl2 USE_XORG= ice x11 xext xi xrandr USE_WX= 3.0+ USE_GL= gl glew glu USES= cmake compiler:c++11-lib dos2unix iconv openal pkgconfig tar:tgz DOS2UNIX_REGEX= .*\.(h|c|cpp) # Disable ALSA (emulated) and ao (buggy) CMAKE_ARGS+= -DTRY_X11:BOOL=ON \ -DDISABLE_WX:BOOL=OFF \ -DENABLE_QT:BOOL=OFF \ -DENABLE_PCH:BOOL=OFF \ -DENABLE_SDL:BOOL=ON \ -DDISABLE_ALSA:BOOL=ON \ -DDISABLE_AO:BOOL=ON \ -DDISABLE_BLUEZ:BOOL=ON \ -DDISABLE_OPENAL:BOOL=OFF \ -DCMAKE_REQUIRED_INCLUDES:PATH="${LOCALBASE}/include" \ -DCMAKE_REQUIRED_FLAGS:STRING="-L${LOCALBASE}/lib" \ -DCMAKE_INSTALL_RPATH_USE_LINK_PATH:BOOL=ON # XXX Bypass git check (and set a dummy -unused- revision) CMAKE_ARGS+= -DDOLPHIN_WC_BRANCH:STRING="stable" \ -DDOLPHIN_WC_REVISION:STRING="1" OPTIONS_DEFINE= PULSEAUDIO PORTAUDIO DEBUG FRAMEDUMPS UPNP NLS OPTIONS_DEFAULT= PORTAUDIO FRAMEDUMPS UPNP OPTIONS_SUB= yes PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio PULSEAUDIO_CMAKE_ON= -DDISABLE_PULSEAUDIO:BOOL=OFF PULSEAUDIO_CMAKE_OFF= -DDISABLE_PULSEAUDIO:BOOL=ON PORTAUDIO_DESC= Enable PortAudio (mic) support PORTAUDIO_LIB_DEPENDS= libportaudio.so:audio/portaudio PORTAUDIO_CMAKE_ON= -DDISABLE_PORTAUDIO:BOOL=OFF PORTAUDIO_CMAKE_OFF= -DDISABLE_PORTAUDIO:BOOL=ON DEBUG_MAKE_ENV= VERBOSE=yes DEBUG_CMAKE_ON= -DFASTLOG:BOOL=ON DEBUG_CMAKE_OFF= -DFASTLOG:BOOL=OFF FRAMEDUMPS_DESC= Encode framedumps in AVI format FRAMEDUMPS_LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg \ libavformat.so:multimedia/ffmpeg \ libswscale.so:multimedia/ffmpeg \ libavutil.so:multimedia/ffmpeg FRAMEDUMPS_CMAKE_ON= -DENCODE_FRAMEDUMPS:BOOL=ON FRAMEDUMPS_CMAKE_OFF= -DENCODE_FRAMEDUMPS:BOOL=OFF UPNP_LIB_DEPENDS= libminiupnpc.so:net/miniupnpc UPNP_CMAKE_ON= -DUSE_UPNP:BOOL=ON UPNP_CMAKE_OFF= -DUSE_UPNP:BOOL=OFF NLS_USES= gettext NLS_CMAKE_ON= -DDISABLE_NLS:BOOL=OFF NLS_CMAKE_OFF= -DDISABLE_NLS:BOOL=ON .include # JIT-enabled binaries are amd64 only .if ${ARCH} != "amd64" CMAKE_ARGS+= -DENABLE_GENERIC:BOOL=ON .endif # When building with Gcc, needs Gcc 4.9+ .if ${COMPILER_TYPE} == gcc && ${COMPILER_VERSION} < 49 USE_GCC= 4.9+ # Enable std::stoul() CXXFLAGS+= -D_GLIBCXX_USE_C99 # Enable log2f(), exp2f() and roundf() CXXFLAGS+= -D_GLIBCXX_USE_C99_MATH_TR1 # Turn on extra long double versions of math functions, needed for cmath CXXFLAGS+= -D__ISO_C_VISIBLE=1999 -D_DECLARE_C99_LDBL_MATH .endif .include diff --git a/games/slade/Makefile b/games/slade/Makefile index 1e8ff5110448..57e05a9000bc 100644 --- a/games/slade/Makefile +++ b/games/slade/Makefile @@ -1,40 +1,42 @@ # Created by: Alexey Dokuchaev # $FreeBSD$ PORTNAME= slade PORTVERSION= 3.1.1.3 +PORTREVISION= 1 CATEGORIES= games MAINTAINER= danfe@FreeBSD.org COMMENT= Modern editor for Doom-engine based games and source ports LICENSE= GPLv2 BUILD_DEPENDS= zip:archivers/zip LIB_DEPENDS= libsfml-system.so:devel/sfml \ libftgl.so:graphics/ftgl \ libfreeimage.so:graphics/freeimage USE_GITHUB= yes GH_ACCOUNT= sirjuddington GH_PROJECT= ${PORTNAME:tu} USES= cmake compiler:c++11-lib pkgconfig USE_WX= 3.0+ +USE_GL= glew USE_CXXSTD= c++11 PLIST_FILES= bin/slade share/slade3/slade.pk3 OPTIONS_DEFINE= FLUIDSYNTH OPTIONS_DEFAULT= FLUIDSYNTH FLUIDSYNTH_LIB_DEPENDS= libfluidsynth.so:audio/fluidsynth FLUIDSYNTH_RUN_DEPENDS= ${LOCALBASE}/share/sounds/sf2/FluidR3_GM.sf2:audio/fluid-soundfont FLUIDSYNTH_CMAKE_OFF= -DNO_FLUIDSYNTH:BOOL=ON post-patch: @${REINPLACE_CMD} -e 's,"alsa","oss", ; \ /share\/sounds\/sf2/s,/usr,${LOCALBASE},g' \ ${WRKSRC}/src/Audio/MIDIPlayer.cpp .include