openSUSE Build Service

Overview Repositories Revisions Requests Users Attributes Meta

File project.diff of Package sfml (Revision 8b6a6db2a07ff98c068e17c6749087c7)

Currently displaying revision 8b6a6db2a07ff98c068e17c6749087c7 , Show latest

--- sfml.changes.orig
+++ sfml.changes
@@ -1,4 +1,15 @@
 -------------------------------------------------------------------
+Sun Jul 29 09:33:35 UTC 2018 - mardnh@gmx.de
+
+- Update to version 2.5.0
+- Use CMake
+- Switched to pkg-config-style BuildRequires
+- Specfile cleanup
+- Remove not longer needed patches
+- Add patch
+  * sfml-fix-build.patch
+
+-------------------------------------------------------------------
 Tue Oct  6 14:03:34 UTC 2015 - rpm@fthiessen.de
 
 - Fixed changelog to accomplish openSUSE Factory requirements to
--- sfml.spec.orig
+++ sfml.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package sfml
 #
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,48 +16,29 @@
 #
 
 
-%define soname 1_6
+%define sover 2_5
 Name:           sfml
-Version:        1.6
+Version:        2.5.0
 Release:        0
 Summary:        Simple and Fast Multimedia Library
 License:        Zlib
 Group:          Development/Libraries/C and C++
-Url:            http://www.sfml-dev.org/
-Source:         sfml-%{version}.tar.gz
-# PATCH-FIX-UPSTREAM
-Patch0:         sfml-1.6-nochm.patch
-# PATCH-FIX-UPSTREAM
-Patch1:         sfml-1.6-cflags.patch
-# PATCH-FIX-UPSTREAM
-Patch2:         sfml-1.6-gcc.patch
-# PATCH-FIX-UPSTREAM
-Patch3:         sfml-1.6-system_libs.patch
-# PATCH-FIX-UPSTREAM
-Patch4:         sfml-1.6-underlinking.patch
-# PATCH-FIX-UPSTREAM
-Patch5:         sfml-1.6-png.patch
-# PATCH-FIX-UPSTREAM
-Patch6:         sfml-1.6-gcc47.patch
-BuildRequires:  Mesa-devel
+URL:            http://www.sfml-dev.org/
+Source:         https://github.com/SFML/SFML/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
+Patch0:         sfml-fix-build.patch
+BuildRequires:  cmake
 BuildRequires:  doxygen
-BuildRequires:  freetype2-devel
 BuildRequires:  gcc-c++
-BuildRequires:  glew-devel
-%if 0%{?suse_version} > 1220
-BuildRequires:  glu-devel
-%endif
-BuildRequires:  libSOIL-devel
-BuildRequires:  libjpeg-devel
-%if 0%{?suse_version} <= 1220
-BuildRequires:  libopenal1
-%endif
-BuildRequires:  libpng-devel
-BuildRequires:  libsndfile-devel
-BuildRequires:  libtool
-BuildRequires:  openal-soft-devel
-BuildRequires:  xorg-x11-devel
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+BuildRequires:  pkgconfig
+BuildRequires:  pkgconfig(flac)
+BuildRequires:  pkgconfig(freetype2)
+BuildRequires:  pkgconfig(gl)
+BuildRequires:  pkgconfig(libudev)
+BuildRequires:  pkgconfig(openal)
+BuildRequires:  pkgconfig(vorbis)
+BuildRequires:  pkgconfig(x11)
+BuildRequires:  pkgconfig(xproto)
+BuildRequires:  pkgconfig(xrandr)
 
 %description
 SFML is a portable and easy to use multimedia API written in C++. You can
@@ -66,11 +47,11 @@ several packages to perfectly suit your
 minimal windowing system to interface with OpenGL, or as a fully-featured
 multimedia library for building games or interactive programs.
 
-%package -n lib%{name}%{soname}
+%package -n lib%{name}%{sover}
 Summary:        SFML library
 Group:          Development/Libraries/C and C++
 
-%description -n lib%{name}%{soname}
+%description -n lib%{name}%{sover}
 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
@@ -80,47 +61,42 @@ multimedia library for building games or
 %package devel
 Summary:        SFML development files
 Group:          Development/Libraries/C and C++
-Requires:       Mesa-devel
-Requires:       libsfml1_6 = %{version}
+BuildRequires:  pkgconfig(gl)
+BuildRequires:  pkgconfig(x11)
+BuildRequires:  pkgconfig(xproto)
+BuildRequires:  pkgconfig(xrandr)
+Requires:       lib%{name}%{sover} = %{version}
 
 %description devel
 Development files for SFML.
 
 %prep
-%setup -q -n sfml-%{version}
-%patch0
-%patch1
-%patch2
-%patch3
-%patch4
-%patch5 -p1
-%patch6 -p1
-rm -rf src/SFML/Graphics/GLEW
-rm -rf src/SFML/Graphics/libjpeg
-rm -rf src/SFML/Graphics/libpng
-rm -rf src/SFML/Graphics/SOIL
-rm -rf src/SFML/Graphics/zlib
-rm -rf src/SFML/Window/glext
+%setup -q -n SFML-%{version}
+%patch0 -p1
 
 %build
-make %{?_smp_mflags} DEBUGFLAGS="%{optflags} -DNDEBUG"
-cd doc/build
-doxygen
+%cmake \
+  -DCMAKE_SHARED_LINKER_FLAGS="" \
+  -DSFML_BUILD_DOC=1
+make %{?_smp_mflags}
 
 %install
-make DESTDIR=%{buildroot}/usr DESTLIBDIR=%{buildroot}%{_libdir} install
+%cmake_install
+rm -rf %{buildroot}/%{_datadir}/SFML
 
-%post -n lib%{name}%{soname} -p /sbin/ldconfig
-%postun -n lib%{name}%{soname} -p /sbin/ldconfig
+%post -n lib%{name}%{sover} -p /sbin/ldconfig
+%postun -n lib%{name}%{sover} -p /sbin/ldconfig
 
-%files -n lib%{name}%{soname}
-%defattr(-,root,root)
-%{_libdir}/lib*.so.*
+%files -n lib%{name}%{sover}
+%doc changelog.md readme.md
+%license license.md
+%{_libdir}/libsfml-*.so.*
 
 %files devel
-%defattr(-,root,root)
-%doc doc/*.htm doc/html
+%doc build/doc/html
 %{_includedir}/SFML
-%{_libdir}/lib*.so
+%{_libdir}/libsfml-*.so
+%{_libdir}/pkgconfig/sfml-*.pc
+%{_libdir}/cmake/SFML
 
 %changelog

Places

File project.diff of Package sfml (Revision 8b6a6db2a07ff98c068e17c6749087c7)

Places