[packages/oyranos] - disable building example that fails with mesa 10 - updated BRs - rel 3
baggins
baggins at pld-linux.org
Sun Jan 5 16:52:15 CET 2014
commit 16c9036b29096669513066e8f3673d679f22ac71
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Sun Jan 5 16:51:47 2014 +0100
- disable building example that fails with mesa 10
- updated BRs
- rel 3
no-mesa10.patch | 16 ++++++++++++++++
oyranos.spec | 9 +++++++--
2 files changed, 23 insertions(+), 2 deletions(-)
---
diff --git a/oyranos.spec b/oyranos.spec
index e2815e0..46afb52 100644
--- a/oyranos.spec
+++ b/oyranos.spec
@@ -8,11 +8,12 @@ Summary: Colour Management System on operating system level
Summary(pl.UTF-8): System zarządzania kolorami na poziomie systemu operacyjnego
Name: oyranos
Version: 0.9.4
-Release: 2
+Release: 3
License: BSD
Group: Applications/Graphics
Source0: http://downloads.sourceforge.net/oyranos/%{name}-%{version}.tar.bz2
# Source0-md5: 582ea87d82a42912ddc45937e4f864b4
+Patch0: no-mesa10.patch
URL: http://www.oyranos.org/
BuildRequires: cmake >= 2.6.4
BuildRequires: cairo-devel
@@ -20,7 +21,10 @@ BuildRequires: cups-devel
BuildRequires: doxygen
BuildRequires: elektra-devel >= 0.7
BuildRequires: exiv2-devel
-%{?with_fltk:BuildRequires: fltk-devel}
+%if %{with fltk}
+BuildRequires: fltk-devel
+BuildRequires: fltk-gl-devel
+%endif
BuildRequires: gcc >= 6:4.2
BuildRequires: gettext-devel
# not required for releases (generated code included)
@@ -175,6 +179,7 @@ Dokumentacja API bibliotek Oyranos.
%prep
%setup -q
+%patch0 -p1
%build
install -d build
diff --git a/no-mesa10.patch b/no-mesa10.patch
new file mode 100644
index 0000000..29d3f9e
--- /dev/null
+++ b/no-mesa10.patch
@@ -0,0 +1,16 @@
+--- oyranos-0.9.4/src/examples/CMakeLists.txt~ 2013-01-19 11:14:14.000000000 +0100
++++ oyranos-0.9.4/src/examples/CMakeLists.txt 2014-01-05 16:44:48.459743318 +0100
+@@ -44,13 +44,6 @@
+
+ # simple image viewer
+ IF( FLTK_FOUND )
+- ADD_EXECUTABLE( image-display
+- "${CMAKE_CURRENT_SOURCE_DIR}/image_display/image_display.cpp"
+- "${CMAKE_CURRENT_SOURCE_DIR}/image_display/GLee.c"
+- )
+- TARGET_LINK_LIBRARIES ( image-display oyranos ${EXTRA_LIBS}
+- ${FLTK_LIBRARIES} )
+- #INSTALL (TARGETS image-display DESTINATION bin)
+ ADD_EXECUTABLE( oyranos-config-fltk
+ oyranos_config_fltk.cxx
+ ../../FL/Flmm_Tabs.cxx
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/oyranos.git/commitdiff/16c9036b29096669513066e8f3673d679f22ac71
More information about the pld-cvs-commit
mailing list