Djam/libprojectm
1
0
Fork 0
mirror of https://abf.rosa.ru/djam/libprojectm.git synced 2025-02-23 18:22:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Automatic import for version 2.1.0

Browse source
This commit is contained in:
Rosa 2012-06-15 04:57:41 +04:00
parent cf1f3a6f0a
commit 20d8efb955
6 changed files with 80 additions and 60 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.abf.yml
View file

@ -1,2 +1,2 @@
sources:
"libprojectM-2.0.0-Source.tar.gz": 50c45b060c3b00fd574f4f092594f18b43669cff
"projectM-complete-2.1.0-Source.tar.gz": a1a966a410360926fee88ff253f929f0290a2405

23
libprojectM-2.0.0-fix-linking.patch
View file

@ -1,23 +0,0 @@
--- CMakeLists.txt.link 2010-02-18 09:50:09.000000000 +0100
+++ CMakeLists.txt 2010-02-18 09:54:35.000000000 +0100
@@ -186,10 +186,10 @@
LINK_DIRECTORIES(${FTGL_LINK_DIRS} ${Renderer_BINARY_DIR} ${PRESET_FACTORY_BINARY_DIR})
if(BUILD_PROJECTM_STATIC)
- TARGET_LINK_LIBRARIES(projectM ${GLEW_LINK_TARGETS} m ${FTGL_LINK_TARGETS} ${OPENGL_LIBRARIES} ${IMAGE_LINK_TARGETS} ${CG_LINK_TARGETS} ${PRESET_FACTORY_LINK_TARGETS})
+ TARGET_LINK_LIBRARIES(projectM Renderer ${IMAGE_LINK_TARGETS} ${CG_LINK_TARGETS} ${PRESET_FACTORY_LINK_TARGETS} ${GLEW_LINK_TARGETS} ${FTGL_LINK_TARGETS} m dl ${OPENGL_LIBRARIES})
else(BUILD_PROJECTM_STATIC)
-TARGET_LINK_LIBRARIES(projectM ${GLEW_LINK_TARGETS} m ${FTGL_LINK_TARGETS} ${OPENGL_LIBRARIES} ${IMAGE_LINK_TARGETS} ${CG_LINK_TARGETS} ${PRESET_FACTORY_LINK_TARGETS})
+ TARGET_LINK_LIBRARIES(projectM Renderer ${IMAGE_LINK_TARGETS} ${CG_LINK_TARGETS} ${PRESET_FACTORY_LINK_TARGETS} ${GLEW_LINK_TARGETS} ${FTGL_LINK_TARGETS} m dl ${OPENGL_LIBRARIES} )
endif(BUILD_PROJECTM_STATIC)
--- Renderer/CMakeLists.txt.link 2010-02-18 10:22:15.000000000 +0100
+++ Renderer/CMakeLists.txt 2010-02-18 10:22:30.000000000 +0100
@@ -13,4 +13,4 @@
INCLUDE_DIRECTORIES(${projectM_SOURCE_DIR})
ADD_LIBRARY(Renderer STATIC ${Renderer_SOURCES})
SET_TARGET_PROPERTIES(Renderer PROPERTIES VERSION 2.00 SOVERSION 2)
-TARGET_LINK_LIBRARIES(Renderer m)
+TARGET_LINK_LIBRARIES(Renderer m ${OPENGL_LIBRARIES} ${FREETYPE2_LIBRARIES})

19
libprojectm-2.1.0-libsuffix.patch Normal file
View file

@ -0,0 +1,19 @@
Index: projectM-complete-2.1.0-Source/src/libprojectM/CMakeLists.txt
===================================================================
--- projectM-complete-2.1.0-Source.orig/src/libprojectM/CMakeLists.txt
+++ projectM-complete-2.1.0-Source/src/libprojectM/CMakeLists.txt
@@ -35,7 +35,7 @@ set(PROJECTM_ABI_LEVEL 2)
ADD_DEFINITIONS(-DCMAKE_INSTALL_PREFIX="\\\"${CMAKE_INSTALL_PREFIX}\\\"")
-SET(LIB_INSTALL_DIR "\${exec_prefix}/lib"
+SET(LIB_INSTALL_DIR "\${exec_prefix}/lib${LIB_SUFFIX}"
CACHE PATH "The subdirectory relative to the install prefix where libraries will be installed (default is /lib)"
FORCE)
@@ -237,4 +237,4 @@ INSTALL(FILES ${Renderer_SOURCE_DIR}/pro
INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/libprojectM.pc DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/pkgconfig)
INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/config.inp DESTINATION ${CMAKE_INSTALL_PREFIX}/share/projectM)
INSTALL(FILES projectM.hpp event.h dlldefs.h fatal.h PCM.hpp Common.hpp DESTINATION include/libprojectM)
-INSTALL(TARGETS projectM DESTINATION lib)
+INSTALL(TARGETS projectM DESTINATION lib${LIB_SUFFIX})

13
libprojectm-2.1.0-path.patch Normal file
View file

@ -0,0 +1,13 @@
Index: projectM-complete-2.1.0-Source/src/libprojectM/CMakeLists.txt
===================================================================
--- projectM-complete-2.1.0-Source.orig/src/libprojectM/CMakeLists.txt
+++ projectM-complete-2.1.0-Source/src/libprojectM/CMakeLists.txt
@@ -33,7 +33,7 @@ set(PROJECTM_VERSION 2.1.0)
set(PROJECTM_ABI_LEVEL 2)
#
-ADD_DEFINITIONS(-DCMAKE_INSTALL_PREFIX="\\\"${CMAKE_INSTALL_PREFIX}\\\"")
+ADD_DEFINITIONS(-DCMAKE_INSTALL_PREFIX="${CMAKE_INSTALL_PREFIX}")
SET(LIB_INSTALL_DIR "\${exec_prefix}/lib${LIB_SUFFIX}"
CACHE PATH "The subdirectory relative to the install prefix where libraries will be installed (default is /lib)"

70
libprojectm.spec
View file

@ -1,6 +1,6 @@
%define name libprojectm
%define version 2.0.0
%define release %mkrel 3
%define version 2.1.0
%define release 2
%define oname libprojectM
%define major 2
%define libname %mklibname projectm %major
@ -12,16 +12,19 @@ Name: %{name}
Version: %{version}
Release: %{release}
Epoch: 1
Source0: %{oname}-%{version}-Source.tar.gz
Patch1: libprojectM-2.0.0-fix-linking.patch
Source0: http://downloads.sourceforge.net/project/projectm/2.1.0/projectM-complete-%{version}-Source.tar.gz
License: LGPLv2+
Group: System/Libraries
Url: http://xmms-projectm.sourceforge.net/
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
Url: http://projectm.sourceforge.net
BuildRequires: libftgl-devel
BuildRequires: cmake
BuildRequires: libglew-devel
BuildRequires: libgomp-devel
BuildRequires: pulseaudio-devel
Patch0: libprojectm-2.1.0-libsuffix.patch
Patch1: libprojectm-2.1.0-path.patch
Patch2: projectm-libsuffix-pkgconf.patch
Requires: %name-data >= %epoch:%version
%description
@ -59,44 +62,35 @@ projectM is a reimplementation of Milkdrop under OpenGL.
%prep
%setup -q -n projectM-%{version}-Source
rm -fr build CMakeCache.txt
#patch0 -p1 -b .ftgl
%patch1 -p0 -b .link
%setup -q -n projectM-complete-%{version}-Source
%patch0 -p1
%patch1 -p1
%patch2 -p1
%build
cd src/libprojectM/
%cmake
%make
%install
rm -rf $RPM_BUILD_ROOT
cd src/libprojectM/
%makeinstall_std -C build
#%ifarch x86_64
# mv %{buildroot}/usr/lib/pkgconfig/ %{buildroot}/%{_libdir}
#%endif
#replace by symlink
ln -sf %_datadir/fonts/TTF/{Vera.ttf,VeraMono.ttf} %buildroot%_datadir/projectM/fonts/
%if %mdkversion < 200900
%post -n %libname -p /sbin/ldconfig
%endif
%if %mdkversion < 200900
%postun -n %libname -p /sbin/ldconfig
%endif
%clean
rm -rf $RPM_BUILD_ROOT
%files data
%defattr(-,root,root)
%doc ChangeLog
#% doc ChangeLog
%_datadir/projectM/
%files -n %libname
%defattr(-,root,root)
%_libdir/libprojectM.so.%{major}*
%files -n %develname
%defattr(-,root,root)
%_libdir/pkgconfig/*.pc
%_includedir/libprojectM/
%_libdir/libprojectM.so
@ -104,7 +98,20 @@ rm -rf $RPM_BUILD_ROOT
%changelog
* Mon May 02 2011 Oden Eriksson <oeriksson@mandriva.com> 1:2.0.0-3mdv2011.0
* Thu Jun 14 2012 Alexander Khrukin <akhrukin@mandriva.org> 1:2.1.0-2
+ Revision: 805601
- added patch for missing pkgconf files
* Thu Jun 14 2012 Alexander Khrukin <akhrukin@mandriva.org> 1:2.1.0-1
+ Revision: 805525
- libdir fix
- version update 2.1.0
* Thu May 03 2012 Götz Waschk <waschk@mandriva.org> 1:2.0.0-4
+ Revision: 795260
- yearly rebuild
* Mon May 02 2011 Oden Eriksson <oeriksson@mandriva.com> 1:2.0.0-3
+ Revision: 661516
- mass rebuild
@ -164,7 +171,7 @@ rm -rf $RPM_BUILD_ROOT
+ Revision: 145761
- rebuild for new libglew
+ Olivier Blin <oblin@mandriva.com>
+ Olivier Blin <blino@mandriva.org>
- restore BuildRoot
+ Thierry Vignaud <tv@mandriva.org>
@ -181,12 +188,3 @@ rm -rf $RPM_BUILD_ROOT
- update file list
- NO major
* Fri Jan 26 2007 Götz Waschk <waschk@mandriva.org> 0.99-2mdv2007.0
+ Revision: 113965
- bump
- Import libprojectm
* Fri Jan 26 2007 Götz Waschk <waschk@mandriva.org> 0.99-1mdv2007.1
- initial package

13
projectm-libsuffix-pkgconf.patch Normal file
View file

@ -0,0 +1,13 @@
diff --git a/src/libprojectM/CMakeLists.txt b/src/libprojectM/CMakeLists.txt
index 81b0ca2..dd11c0d 100644
--- a/src/libprojectM/CMakeLists.txt
+++ b/src/libprojectM/CMakeLists.txt
@@ -234,7 +234,7 @@ ENDIF(projectM_FONT_MENU MATCHES "${CMAKE_INSTALL_PREFIX}/${RESOURCE_PREFIX}/fon
FILE(GLOB presets "presets/*.milk" "presets/*.prjm" "presets/*.tga")
INSTALL(FILES ${presets} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/projectM/presets)
INSTALL(FILES ${Renderer_SOURCE_DIR}/projectM.cg ${Renderer_SOURCE_DIR}/blur.cg DESTINATION ${CMAKE_INSTALL_PREFIX}/share/projectM/shaders)
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/libprojectM.pc DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/pkgconfig)
+INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/libprojectM.pc DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/pkgconfig)
INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/config.inp DESTINATION ${CMAKE_INSTALL_PREFIX}/share/projectM)
INSTALL(FILES projectM.hpp event.h dlldefs.h fatal.h PCM.hpp Common.hpp DESTINATION include/libprojectM)
INSTALL(TARGETS projectM DESTINATION lib${LIB_SUFFIX})