summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2015-08-08 13:49:04 -0700
committerRobin H. Johnson <robbat2@gentoo.org>2015-08-08 17:38:18 -0700
commit56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch)
tree3f91093cdb475e565ae857f1c5a7fd339e2d781e /media-libs/libprojectm/files
downloadgentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip
proj/gentoo: Initial commit
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'media-libs/libprojectm/files')
-rw-r--r--media-libs/libprojectm/files/libprojectm-1.2.0-gcc44.patch9
-rw-r--r--media-libs/libprojectm/files/libprojectm-2.0.1-pcfix.patch12
-rw-r--r--media-libs/libprojectm/files/libprojectm-2.1.0-multilib.patch22
-rw-r--r--media-libs/libprojectm/files/libprojectm-2.1.0-path.patch13
4 files changed, 56 insertions, 0 deletions
diff --git a/media-libs/libprojectm/files/libprojectm-1.2.0-gcc44.patch b/media-libs/libprojectm/files/libprojectm-1.2.0-gcc44.patch
new file mode 100644
index 000000000000..06d916f7c394
--- /dev/null
+++ b/media-libs/libprojectm/files/libprojectm-1.2.0-gcc44.patch
@@ -0,0 +1,9 @@
+diff -ur libprojectM-1.2.0.orig/BuiltinParams.cpp libprojectM-1.2.0/BuiltinParams.cpp
+--- libprojectM-1.2.0.orig/BuiltinParams.cpp 2008-06-12 03:39:28.000000000 +0000
++++ libprojectM-1.2.0/BuiltinParams.cpp 2009-05-07 20:05:54.000000000 +0000
+@@ -1,4 +1,4 @@
+-
++#include <cstdio>
+ #include "fatal.h"
+ #include "BuiltinParams.hpp"
+ #include <cassert>
diff --git a/media-libs/libprojectm/files/libprojectm-2.0.1-pcfix.patch b/media-libs/libprojectm/files/libprojectm-2.0.1-pcfix.patch
new file mode 100644
index 000000000000..c871b78910a1
--- /dev/null
+++ b/media-libs/libprojectm/files/libprojectm-2.0.1-pcfix.patch
@@ -0,0 +1,12 @@
+Index: projectM-2.0.1-Source/libprojectM.pc.in
+===================================================================
+--- projectM-2.0.1-Source.orig/libprojectM.pc.in
++++ projectM-2.0.1-Source/libprojectM.pc.in
+@@ -1,6 +1,6 @@
+ prefix=@CMAKE_INSTALL_PREFIX@
+ exec_prefix=@CMAKE_INSTALL_PREFIX@
+-libdir=@LIB_INSTALL_DIR@
++libdir=${exec_prefix}/lib@LIB_SUFFIX@
+ includedir=@CMAKE_INSTALL_PREFIX@/include
+ pkgdatadir=@CMAKE_INSTALL_PREFIX@/@RESOURCE_PREFIX@
+ sysconfdir=@CMAKE_INSTALL_PREFIX@/@RESOURCE_PREFIX@
diff --git a/media-libs/libprojectm/files/libprojectm-2.1.0-multilib.patch b/media-libs/libprojectm/files/libprojectm-2.1.0-multilib.patch
new file mode 100644
index 000000000000..8477a270df89
--- /dev/null
+++ b/media-libs/libprojectm/files/libprojectm-2.1.0-multilib.patch
@@ -0,0 +1,22 @@
+diff -urN projectM-complete-2.1.0-Source/src/libprojectM/CMakeLists.txt projectM-complete-2.1.0-Source.new/src/libprojectM/CMakeLists.txt
+--- projectM-complete-2.1.0-Source/src/libprojectM/CMakeLists.txt 2012-05-20 05:43:26.000000000 +0200
++++ projectM-complete-2.1.0-Source.new/src/libprojectM/CMakeLists.txt 2013-01-21 21:07:49.097541426 +0100
+@@ -35,7 +35,7 @@
+
+ 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)
+
+@@ -234,7 +234,7 @@
+ 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)
++INSTALL(TARGETS projectM DESTINATION lib${LIB_SUFFIX})
diff --git a/media-libs/libprojectm/files/libprojectm-2.1.0-path.patch b/media-libs/libprojectm/files/libprojectm-2.1.0-path.patch
new file mode 100644
index 000000000000..39fa7e35da38
--- /dev/null
+++ b/media-libs/libprojectm/files/libprojectm-2.1.0-path.patch
@@ -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)"