← Back to branch summary

~siretart/ubuntu/utopic/blender/libav10

« back to all changes in this revision

Viewing changes to debian/patches/0002-use_systemwide_libraries.patch

  • Committer: Package Import Robot
  • Author(s): Matteo F. Vescovi
  • Date: 2012-07-23 08:54:18 UTC
  • mfrom: (14.2.16 sid)
  • mto: (14.2.19 sid)
  • mto: This revision was merged to the branch mainline in revision 42.
  • Revision ID: package-import@ubuntu.com-20120723085418-9foz30v6afaf5ffs
Tags: 2.63a-2
http://bugs.debian.org/658075
* debian/: Cycles support added (Closes: #658075)
  For now, this top feature has been enabled only
  on [any-amd64 any-i386] architectures because
  of OpenImageIO failing on all others
* debian/: scripts installation path changed
  from /usr/lib to /usr/share:
  + debian/patches/: patchset re-worked for path changing
  + debian/control: "Breaks" field added on yafaray-exporter

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/0002-use_systemwide_libraries.patch
1
 
From: Kevin Roy <kiniou@gmail.com>
2
 
Date: Tue, 28 Sep 2010 15:00:23 +0200
3
 
Subject: [PATCH] use_systemwide_libraries
4
 
 
5
 
Don't try and use extern/libopenjpeg nor extern/glew
6
 
---
7
 
 CMakeLists.txt        |    7 ++++++-
8
 
 extern/CMakeLists.txt |    6 ------
9
 
 2 files changed, 6 insertions(+), 7 deletions(-)
10
 
 
11
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
12
 
index c6d8fb9..5f4850e 100644
13
 
--- a/CMakeLists.txt
14
 
+++ b/CMakeLists.txt
15
 
@@ -289,7 +289,7 @@ IF(UNIX AND NOT APPLE)
16
 
 
17
 
 
18
 
        # Could use ${X11_Xinput_LIB} ${X11_X11_LIB} too
19
 
-       SET(LLIBS "-lXi -lutil -lc -lm -lpthread -lstdc++ -lX11")
20
 
+       SET(LLIBS "-lXi -lutil -lc -lm -lpthread -lX11")
21
 
 
22
 
        IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
23
 
                # BSD's dont use libdl.so
24
 
@@ -306,6 +306,11 @@ IF(UNIX AND NOT APPLE)
25
 
                SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fopenmp")
26
 
        ENDIF(WITH_OPENMP)
27
 
 
28
 
+       # Use system-wide GLEW:
29
 
+       SET(LLIBS "${LLIBS} -lGLEW")
30
 
+       SET(LLIBS "${LLIBS} -lopenjpeg")
31
 
+
32
 
+       ADD_DEFINITIONS(-DWITH_OPENJPEG)
33
 
 
34
 
        SET(PLATFORM_CFLAGS "-pipe -fPIC -funsigned-char -fno-strict-aliasing -Wno-char-subscripts")
35
 
 
36
 
diff --git a/extern/CMakeLists.txt b/extern/CMakeLists.txt
37
 
index e14d416..4f741ce 100644
38
 
--- a/extern/CMakeLists.txt
39
 
+++ b/extern/CMakeLists.txt
40
 
@@ -32,12 +32,6 @@ IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
41
 
        ADD_SUBDIRECTORY(binreloc)
42
 
 ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux")
43
 
 
44
 
-ADD_SUBDIRECTORY(glew)
45
 
-
46
 
-IF(WITH_OPENJPEG)
47
 
-       ADD_SUBDIRECTORY(libopenjpeg)
48
 
-ENDIF(WITH_OPENJPEG)
49
 
-
50
 
 IF(WITH_LZO)
51
 
        ADD_SUBDIRECTORY(lzo)
52
 
 ENDIF(WITH_LZO)