import sources
This commit is contained in:
Adam Samalik
commit
f551cec36d
1
.gitignore
vendored
Normal file
1
.gitignore
vendored
Normal file
@ -0,0 +1 @@
|
||||
/SFML-2.4.2-clean.tar.gz
|
||||
20
SFML-do-not-use-Pong-trademark.patch
Normal file
20
SFML-do-not-use-Pong-trademark.patch
Normal file
@ -0,0 +1,20 @@
|
||||
--- examples/pong/Pong.cpp~ 2017-02-05 16:20:55.162895169 +0530
|
||||
+++ examples/pong/Pong.cpp 2017-02-05 16:21:17.150992547 +0530
|
||||
@@ -27,7 +27,7 @@ int main()
|
||||
float ballRadius = 10.f;
|
||||
|
||||
// Create the window of the application
|
||||
- sf::RenderWindow window(sf::VideoMode(gameWidth, gameHeight, 32), "SFML Pong",
|
||||
+ sf::RenderWindow window(sf::VideoMode(gameWidth, gameHeight, 32), "SFML Virtual Tennis",
|
||||
sf::Style::Titlebar | sf::Style::Close);
|
||||
window.setVerticalSyncEnabled(true);
|
||||
|
||||
@@ -72,7 +72,7 @@ int main()
|
||||
pauseMessage.setCharacterSize(40);
|
||||
pauseMessage.setPosition(170.f, 150.f);
|
||||
pauseMessage.setFillColor(sf::Color::White);
|
||||
- pauseMessage.setString("Welcome to SFML pong!\nPress space to start the game");
|
||||
+ pauseMessage.setString("Welcome to SFML virtual tennis\nPress space to start the game");
|
||||
|
||||
// Define the paddles properties
|
||||
sf::Clock AITimer;
|
||||
26
SFML-strict-aliasing.patch
Normal file
26
SFML-strict-aliasing.patch
Normal file
@ -0,0 +1,26 @@
|
||||
--- src/SFML/Graphics/Font.cpp~ 2017-02-17 22:38:42.144725860 +0530
|
||||
+++ src/SFML/Graphics/Font.cpp 2017-02-17 22:37:41.094344692 +0530
|
||||
@@ -61,6 +61,14 @@
|
||||
void close(FT_Stream)
|
||||
{
|
||||
}
|
||||
+
|
||||
+ template <typename T, typename U>
|
||||
+ inline T reinterpret(const U& input)
|
||||
+ {
|
||||
+ T output;
|
||||
+ std::memcpy(&output, &input, sizeof(U));
|
||||
+ return output;
|
||||
+ }
|
||||
}
|
||||
|
||||
|
||||
@@ -325,7 +333,7 @@
|
||||
GlyphTable& glyphs = m_pages[characterSize].glyphs;
|
||||
|
||||
// Build the key by combining the code point, bold flag, and outline thickness
|
||||
- Uint64 key = (static_cast<Uint64>(*reinterpret_cast<Uint32*>(&outlineThickness)) << 32)
|
||||
+ Uint64 key = (static_cast<Uint64>(reinterpret<Uint32>(outlineThickness)) << 32)
|
||||
| (static_cast<Uint64>(bold ? 1 : 0) << 31)
|
||||
| static_cast<Uint64>(codePoint);
|
||||
|
||||
21
SFML-unresolved__cpu_model-fix.patch
Normal file
21
SFML-unresolved__cpu_model-fix.patch
Normal file
@ -0,0 +1,21 @@
|
||||
diff -up extlibs/headers/stb_image/stb_image.h~ extlibs/headers/stb_image/stb_image.h
|
||||
--- extlibs/headers/stb_image/stb_image.h~ 2015-08-24 18:01:06.000000000 +0200
|
||||
+++ extlibs/headers/stb_image/stb_image.h 2016-02-27 22:53:15.712543109 +0100
|
||||
@@ -671,14 +671,9 @@ static int stbi__sse2_available()
|
||||
|
||||
static int stbi__sse2_available()
|
||||
{
|
||||
-#if defined(__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__) >= 408 // GCC 4.8 or later
|
||||
- // GCC 4.8+ has a nice way to do this
|
||||
- return __builtin_cpu_supports("sse2");
|
||||
-#else
|
||||
- // portable way to do this, preferably without using GCC inline ASM?
|
||||
- // just bail for now.
|
||||
- return 0;
|
||||
-#endif
|
||||
+ // We only enable SSE2 on gcc when build with -msse2, so it is always
|
||||
+ // safe to use SSE2, simply return 1
|
||||
+ return 1;
|
||||
}
|
||||
#endif
|
||||
#endif
|
||||
224
SFML.spec
Normal file
224
SFML.spec
Normal file
@ -0,0 +1,224 @@
|
||||
Name: SFML
|
||||
Version: 2.4.2
|
||||
Release: 5%{?dist}
|
||||
Summary: Simple and Fast Multimedia Library
|
||||
|
||||
# src/SFML/Audio/stb_vorbis/stb_vorbis.{c,h} are Public Domain
|
||||
License: zlib and Public Domain
|
||||
URL: http://www.sfml-dev.org/
|
||||
# This is http://www.sfml-dev.org/download/sfml/SFML-2.4.2-sources.zip
|
||||
# with the non free contents removed - See rhbz#1310387 and rhbz#1003569
|
||||
# List of deleted files
|
||||
# examples/android/assets/canary.wav
|
||||
# examples/android/assets/orchestral.ogg
|
||||
# examples/android/assets/sansation.ttf
|
||||
# examples/cocoa/resources/sansation.ttf
|
||||
# examples/opengl/resources/background.jpg
|
||||
# examples/opengl/resources/sansation.ttf
|
||||
# examples/opengl/resources/texture.jpg
|
||||
# examples/pong/resources/ball.wav
|
||||
# examples/pong/resources/sansation.ttf
|
||||
# examples/shader/resources/background.jpg
|
||||
# examples/shader/resources/devices.png
|
||||
# examples/shader/resources/sansation.ttf
|
||||
# examples/sound/resources/canary.wav
|
||||
# examples/sound/resources/orchestral.ogg
|
||||
# examples/win32/resources/image1.jpg
|
||||
# examples/win32/resources/image2.jpg
|
||||
# tools/xcode/templates/SFML/SFML App.xctemplate/sansation.ttf
|
||||
# tools/xcode/templates/SFML/SFML CLT.xctemplate/sansation.ttf
|
||||
Source0: %{name}-%{version}-clean.tar.gz
|
||||
Patch0: SFML-unresolved__cpu_model-fix.patch
|
||||
Patch1: SFML-do-not-use-Pong-trademark.patch
|
||||
# Upstream issue - https://github.com/SFML/SFML/issues/1187
|
||||
Patch2: SFML-strict-aliasing.patch
|
||||
|
||||
BuildRequires: cmake
|
||||
BuildRequires: doxygen
|
||||
BuildRequires: freetype-devel
|
||||
BuildRequires: libvorbis-devel
|
||||
BuildRequires: flac-devel
|
||||
BuildRequires: systemd-devel
|
||||
BuildRequires: xcb-util-image-devel
|
||||
BuildRequires: glew-devel
|
||||
BuildRequires: libjpeg-devel
|
||||
BuildRequires: libsndfile-devel
|
||||
BuildRequires: libXrandr-devel
|
||||
BuildRequires: openal-devel
|
||||
|
||||
%description
|
||||
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.
|
||||
|
||||
%package devel
|
||||
Summary: Development files for %{name}
|
||||
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||
Requires: cmake
|
||||
|
||||
%description devel
|
||||
The %{name}-devel package contains libraries and header files for
|
||||
developing applications that use %{name}.
|
||||
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch0 -p0
|
||||
%patch1 -p0
|
||||
%patch2 -p0
|
||||
# fixup non needed executable permission on regular files
|
||||
find -type f -print0 | xargs -0 chmod -x
|
||||
# fixup %%doc files line endings
|
||||
sed -i.bak 's/\r//' license.txt readme.txt
|
||||
touch -r license.txt.bak license.txt
|
||||
touch -r readme.txt.bak readme.txt
|
||||
find extlibs/ -type f ! -name 'stb_image*' -print0 | xargs -0 rm
|
||||
|
||||
|
||||
%build
|
||||
%cmake -DSFML_BUILD_DOC=TRUE -DSFML_INSTALL_PKGCONFIG_FILES=TRUE .
|
||||
make %{?_smp_mflags}
|
||||
|
||||
|
||||
%install
|
||||
%make_install
|
||||
# move FindSFML.cmake to the standard location
|
||||
mkdir -p $RPM_BUILD_ROOT%{_datadir}/cmake/Modules
|
||||
mv $RPM_BUILD_ROOT%{_datadir}/%{name}/cmake/Modules/FindSFML.cmake \
|
||||
$RPM_BUILD_ROOT%{_datadir}/cmake/Modules
|
||||
# remove duplicated documentation
|
||||
rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/*.txt
|
||||
rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/doc
|
||||
|
||||
|
||||
%post -p /sbin/ldconfig
|
||||
|
||||
%postun -p /sbin/ldconfig
|
||||
|
||||
|
||||
%files
|
||||
%doc license.txt readme.txt
|
||||
%{_libdir}/*.so.*
|
||||
|
||||
%files devel
|
||||
%doc doc/html/*
|
||||
%{_datadir}/cmake/Modules/FindSFML.cmake
|
||||
%{_includedir}/%{name}/
|
||||
%{_libdir}/pkgconfig/sfml-*.pc
|
||||
%{_libdir}/libsfml-*.so
|
||||
|
||||
|
||||
%changelog
|
||||
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.2-5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
||||
|
||||
* Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.2-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
|
||||
|
||||
* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.2-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
|
||||
|
||||
* Fri Feb 17 2017 Pranav Kant <pranvk@fedoraproject.org> - 2.4.2-2
|
||||
- Rename SFML-2.4.2-clean directory to SFML-2.4.2 before compressing
|
||||
|
||||
* Fri Feb 17 2017 Pranav Kant <pranvk@fedoraproject.org> - 2.4.2-1
|
||||
- Update to 2.4.2
|
||||
- Patch for -Wstrict-aliasing
|
||||
|
||||
* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.1-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
|
||||
|
||||
* Sun Feb 05 2017 Pranav Kant <pranvk@fedoraproejct.org> - 2.4.1-2
|
||||
- Add missing update change log entry here
|
||||
|
||||
* Sun Feb 05 2017 Pranav Kant <pranvk@fedoraproject.org> - 2.4.1-1
|
||||
- Update to 2.4.1
|
||||
|
||||
* Sat Mar 19 2016 Pranav Kant <pranvk@fedoraproject.org> - 2.3.2-4
|
||||
- Remove copyright/trademark content - rhbz#1310387
|
||||
|
||||
* Sat Feb 27 2016 Hans de Goede <hdegoede@redhat.com> - 2.3.2-3
|
||||
- Fix unresolved __cpu_model symbol in sfml-graphics.so
|
||||
|
||||
* Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.2-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
|
||||
|
||||
* Wed Sep 16 2015 Pranav Kant <pranvk@fedoraproject.org> - 2.3.2-1
|
||||
- Update to 2.3.2
|
||||
|
||||
* Mon Jun 22 2015 Pranav Kant <pranvk@fedoraproject.org> - 2.3-1
|
||||
- Update to 2.3
|
||||
|
||||
* Tue Jun 16 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.1-5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
|
||||
|
||||
* Sat May 02 2015 Kalev Lember <kalevlember@gmail.com> - 2.1-4
|
||||
- Rebuilt for GCC 5 C++11 ABI change
|
||||
|
||||
* Fri Aug 15 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.1-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
|
||||
|
||||
* Fri Jun 06 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.1-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
|
||||
|
||||
* Mon Feb 10 2014 Hans de Goede <hdegoede@redhat.com> - 2.1-1
|
||||
- Update to version 2.1 (rhbz#1033924)
|
||||
|
||||
* Mon Nov 18 2013 Hans de Goede <hdegoede@redhat.com> - 2.0-6
|
||||
- Really move cmake file to proper location (rhbz#997679)
|
||||
- Remove non free font from source tarbal (rhbz#1003569)
|
||||
|
||||
* Mon Nov 18 2013 Hans de Goede <hdegoede@redhat.com> - 2.0-5
|
||||
- Drop changes to make parallel installable with 1.6, instead compat-SFML16
|
||||
has now been changed to avoid the conflicts (rhbz#997679)
|
||||
- Move cmake file to proper location and put it in -devel
|
||||
|
||||
* Mon Nov 18 2013 Dave Airlie <airlied@redhat.com> - 2.0-4
|
||||
- rebuilt for GLEW 1.10
|
||||
|
||||
* Fri Aug 02 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.0-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
|
||||
|
||||
* Sun May 26 2013 Hans de Goede <hdegoede@redhat.com> - 2.0-2
|
||||
- Make parallel installable with 1.6 (avoid conflict with compat-SFML16)
|
||||
- Fix rpmlint warnings
|
||||
- Fix Source0 URL
|
||||
|
||||
* Wed May 01 2013 Julian Sikorski <belegdol@fedoraproject.org> - 2.0-1
|
||||
- Updated to 2.0
|
||||
|
||||
* Wed Feb 13 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.6-10
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
|
||||
|
||||
* Fri Jan 18 2013 Adam Tkac <atkac redhat com> - 1.6-9
|
||||
- rebuild due to "jpeg8-ABI" feature drop
|
||||
|
||||
* Thu Dec 13 2012 Adam Jackson <ajax@redhat.com> - 1.6-8
|
||||
- Rebuild for glew 1.9.0
|
||||
|
||||
* Fri Jul 27 2012 Julian Sikorski <belegdol@fedoraproject.org> - 1.6-7
|
||||
- Rebuilt for glew-1.7
|
||||
|
||||
* Wed Jul 18 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.6-6
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
|
||||
|
||||
* Tue Feb 28 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.6-5
|
||||
- Rebuilt for c++ ABI breakage
|
||||
|
||||
* Fri Jan 13 2012 Julian Sikorski <belegdol@fedoraproject.org> - 1.6-4
|
||||
- Fixed the License tag
|
||||
|
||||
* Thu Jan 12 2012 Julian Sikorski <belegdol@fedoraproject.org> - 1.6-3
|
||||
- Use one patch and variables in place of sed to fix the makefile
|
||||
- Fixed building with libpng-1.5 using a patch from Gentoo
|
||||
- Updated the gcc patch for gcc-4.7
|
||||
|
||||
* Fri Dec 23 2011 Julian Sikorski <belegdol@fedoraproject.org> - 1.6-2
|
||||
- s/libSOIL/SOIL
|
||||
- Fixed the shared libs usage
|
||||
|
||||
* Wed Nov 30 2011 Julian Sikorski <belegdol@fedoraproject.org> - 1.6-1
|
||||
- Initial RPM release based on Debian package
|
||||
|
||||
Loading…
Reference in New Issue
Block a user