Package: libprojectm
Version: 1.01-6
Severity: important
Tags: patch
Hello,
attached is a patch for libprojectm to make it build with the
forthcoming version of FTGL (currently in experimental). Please let me
know if you oppose an NMU from me when I upload ftgl to unstable; if you
do, then I will simply raise the severity of this bug and let you upload
the fixed version.
-- System Information:
Debian Release: lenny/sid
APT prefers unstable
APT policy: (500, 'unstable'), (500, 'testing'), (1, 'experimental')
Architecture: amd64 (x86_64)
Kernel: Linux 2.6.24.3 (SMP w/2 CPU cores; PREEMPT)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash
diff -purN libprojectm-1.01.sid/debian/changelog
libprojectm-1.01/debian/changelog
--- libprojectm-1.01.sid/debian/changelog 2008-06-11 13:43:21.000000000
+0000
+++ libprojectm-1.01/debian/changelog 2008-06-11 13:48:19.000000000 +0000
@@ -1,3 +1,13 @@
+libprojectm (1.01-6.1) experimental; urgency=low
+
+ * Non-maintainer upload.
+ * Build-depend on libftgl-dev in order to use the shared version of the
+ library.
+ * 10_shared_ftgl.dpatch: new patch, use the proper FTGL header.
+ * 03_cmake_ftgl_pic.dpatch: remove obsolete patch.
+
+ -- Sam Hocevar (Debian packages) <[EMAIL PROTECTED]> Wed, 11 Jun 2008
13:47:34 +0000
+
libprojectm (1.01-6) unstable; urgency=low
* Fix a bogus dependency relation. (Closes: #477051)
diff -purN libprojectm-1.01.sid/debian/patches/00list
libprojectm-1.01/debian/patches/00list
--- libprojectm-1.01.sid/debian/patches/00list 2008-06-11 13:43:21.000000000
+0000
+++ libprojectm-1.01/debian/patches/00list 2008-06-11 13:47:25.000000000
+0000
@@ -1,5 +1,5 @@
01_soil_64bit_fixes.dpatch
02_cmake_soname.dpatch
-03_cmake_ftgl_pic.dpatch
04_fix_brokenness_on_radeon_cards.dpatch
05_fix_gcc43_ftbfs.dpatch
+10_shared_ftgl.dpatch
diff -purN libprojectm-1.01.sid/debian/patches/03_cmake_ftgl_pic.dpatch
libprojectm-1.01/debian/patches/03_cmake_ftgl_pic.dpatch
--- libprojectm-1.01.sid/debian/patches/03_cmake_ftgl_pic.dpatch
2008-06-11 13:43:21.000000000 +0000
+++ libprojectm-1.01/debian/patches/03_cmake_ftgl_pic.dpatch 1970-01-01
00:00:00.000000000 +0000
@@ -1,20 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 03_cmake_ftgl_pic.dpatch by William Pitcock <[EMAIL PROTECTED]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Changes CMakeLists.txt to point to libftgl_pic.a instead, so that FTGL
-## DP: can be used on PIC-strict architectures.
-
[EMAIL PROTECTED]@
-
---- libprojectM-1.01/CMakeLists.txt 2007-10-10 09:47:14.000000000 -0500
-+++ libprojectM-1.01+debian/CMakeLists.txt 2007-12-17 16:55:08.000000000
-0600
-@@ -22,7 +22,7 @@
- ADD_DEFINITIONS(-DUSE_FTGL)
- INCLUDE_DIRECTORIES(${FTGL_INCLUDE_DIRS})
- LINK_DIRECTORIES(${FTGL_LIBRARY_DIRS} "./")
-- TARGET_LINK_LIBRARIES(projectM GLEW m ftgl freetype)
-+ TARGET_LINK_LIBRARIES(projectM GLEW m ftgl_pic freetype)
- ENDIF(USE_FTGL)
-
- CONFIGURE_FILE("libprojectM.pc.in" "libprojectM.pc" @ONLY)
diff -purN libprojectm-1.01.sid/debian/patches/10_shared_ftgl.dpatch
libprojectm-1.01/debian/patches/10_shared_ftgl.dpatch
--- libprojectm-1.01.sid/debian/patches/10_shared_ftgl.dpatch 1970-01-01
00:00:00.000000000 +0000
+++ libprojectm-1.01/debian/patches/10_shared_ftgl.dpatch 2008-06-11
13:47:13.000000000 +0000
@@ -0,0 +1,20 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 10_shared_ftgl.dpatch by Sam Hocevar <[EMAIL PROTECTED]>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Use the proper header for FTGL dynamic linking.
+
[EMAIL PROTECTED]@
+
+--- libprojectM-1.01/Renderer.hpp.orig 2008-06-11 13:45:16.000000000 +0000
++++ libprojectM-1.01+debian/Renderer.hpp 2008-06-11 13:45:28.000000000
+0000
+@@ -22,8 +22,6 @@
+ #include <FTGLExtrdFont.h>
+ #else
+-#include <FTGL/FTGL.h>
+-#include <FTGL/FTGLPixmapFont.h>
+-#include <FTGL/FTGLExtrdFont.h>
++#include <FTGL/ftgl.h>
+ #endif
+ #endif /** USE_FTGL */
+
