← Back to branch summary

~ubuntu-branches/ubuntu/precise/s3d/precise

« back to all changes in this revision

Viewing changes to debian/patches/104-reduce-depends.patch

  • Committer: Bazaar Package Importer
  • Author(s): Sven Eckelmann
  • Date: 2009-07-11 17:00:52 UTC
  • mfrom: (1.1.1 upstream)
  • Revision ID: james.westby@ubuntu.com-20090711170052-2lltwp4rr01e6oly
* New upstream release
* debian/control:
  - Reduce debhelper dependency to 5
  - Only depend on xmlto and docbook-xml in Build-Depends-Indep for
    arch all package s3d-doc
* debian/patches:
  - Add 100-installable-examples.patch, make example usable without
    extra headers
  - Remove upstream merged patches 100-hyphen-used-as-minus-sign.patch,
    101-fix-sigbus-on-mips.patch, 102-send-correct-load-over-net.patch,
    103-endian-safe-float.patch, 104-reduce-depends.patch,
    105-s3dfm-pathnames.patch, 106-g3dorientation.patch,
    107-fix-cmake-ftbfs.patch, 108-fix-gpsd-ftbfs.patch,
    109-strip-libs3d-parameters.patch, 110-s3dosm-api06.patch,
    111-xmlto-documentation.patch
* Install examples with libs3d-dev and libs3dw-dev
* Convert debian/copyright to new dep5 version
* Upgraded to policy 3.8.2, no changes required
* Install upstream changelogs

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/104-reduce-depends.patch
1
 
From 72bbd11aa00b8f589d681d993b3363fb03c23035 Mon Sep 17 00:00:00 2001
2
 
From: Sven Eckelmann <sven.eckelmann@gmx.de>
3
 
Date: Mon, 17 Nov 2008 23:54:05 +0000
4
 
Subject: [PATCH] Reduce number of indirectly linked libraries
5
 
 
6
 
---
7
 
 libs3d/CMakeLists.txt      |    5 +++--
8
 
 libs3dw/CMakeLists.txt     |    5 +++--
9
 
 apps/s3dosm/CMakeLists.txt |    2 +-
10
 
 3 files changed, 7 insertions(+), 5 deletions(-)
11
 
 
12
 
diff --git a/libs3d/CMakeLists.txt b/libs3d/CMakeLists.txt
13
 
index a58f3b4..bf6ca49 100644
14
 
--- a/libs3d/CMakeLists.txt
15
 
+++ b/libs3d/CMakeLists.txt
16
 
@@ -7,8 +7,9 @@ add_library(s3d SHARED callback.c error.c event.c fontselect.c freetype.c
17
 
        sei_construct.c sei_misc.c sei_monotone.c sei_tri.c shm.c
18
 
        shm_ringbuf.c tcp.c vector.c hash.c texture.c)
19
 
 target_link_libraries(s3d ${S3D_LIBRARY_DEPENDENCIES})
20
 
-set_target_properties(s3d PROPERTIES VERSION ${VERSION} SOVERSION 2)
21
 
-set(S3D_LIBRARIES ${S3D_LIBRARY_DEPENDENCIES} s3d CACHE PATHS "Path to libraries")
22
 
+set_target_properties(s3d PROPERTIES VERSION ${VERSION} SOVERSION 2
23
 
+                      LINK_INTERFACE_LIBRARIES "")
24
 
+set(S3D_LIBRARIES s3d CACHE PATHS "Path to libraries")
25
 
 
26
 
 # install
27
 
 install(TARGETS s3d
28
 
diff --git a/libs3dw/CMakeLists.txt b/libs3dw/CMakeLists.txt
29
 
index e5d6217..cd3b792 100644
30
 
--- a/libs3dw/CMakeLists.txt
31
 
+++ b/libs3dw/CMakeLists.txt
32
 
@@ -1,11 +1,12 @@
33
 
 include_directories(${s3d_SOURCE_DIR}/libs3d ${s3d_SOURCE_DIR}/libs3dw)
34
 
 
35
 
-set(S3DW_LIBRARY_DEPENDENCIES s3d ${S3D_LIBRARY_DEPENDENCIES})
36
 
+set(S3DW_LIBRARY_DEPENDENCIES s3d ${MATH_LIBRARIES})
37
 
 
38
 
 add_library(s3dw SHARED animate.c arrange.c button.c event.c input.c
39
 
        label.c root.c scrollbar.c style.c surface.c textbox.c widget.c)
40
 
 target_link_libraries(s3dw ${S3DW_LIBRARY_DEPENDENCIES})
41
 
-set_target_properties(s3dw PROPERTIES VERSION ${VERSION} SOVERSION 2)
42
 
+set_target_properties(s3dw PROPERTIES VERSION ${VERSION} SOVERSION 2
43
 
+                      LINK_INTERFACE_LIBRARIES "")
44
 
 set(S3DW_LIBRARIES s3dw CACHE PATHS "Path to libraries")
45
 
 
46
 
 # install
47
 
diff --git a/apps/s3dosm/CMakeLists.txt b/apps/s3dosm/CMakeLists.txt
48
 
index 2f37af2..86f9f5c 100644
49
 
--- a/apps/s3dosm/CMakeLists.txt
50
 
+++ b/apps/s3dosm/CMakeLists.txt
51
 
@@ -8,7 +8,7 @@ if (LIBXML2_FOUND AND SQLITE3_FOUND)
52
 
                io.c kismet.c main.c nav.c object.c osm.c
53
 
                tag.c ui.c)
54
 
 
55
 
-       target_link_libraries(s3dosm ${S3D_LIBRARIES} ${S3DW_LIBRARIES}
56
 
+       target_link_libraries(s3dosm ${S3D_LIBRARIES} ${S3DW_LIBRARIES} ${MATH_LIBRARIES}
57
 
                ${LIBXML2_LIBRARIES} ${SQLITE3_LIBRARIES})
58
 
 
59
 
        if (GPS_FOUND)
60
 
1.6.0.4
61