summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwangfei <feix.w.wang@intel.com>2013-12-13 16:43:10 +0800
committerwangfei <feix.w.wang@intel.com>2013-12-13 16:46:05 +0800
commite9c36cad490cec9af8089ec0b913c617e67ba524 (patch)
treec8f0f6acd16478d3e69472f23ee28f2ac87c2d21
parent5f8568b6827e00ecf21a71b55fb40444173bbd62 (diff)
downloadgiflib-e9c36cad490cec9af8089ec0b913c617e67ba524.tar.gz
giflib-e9c36cad490cec9af8089ec0b913c617e67ba524.tar.bz2
giflib-e9c36cad490cec9af8089ec0b913c617e67ba524.zip
The display server based on X or Wayland, is now a choice of different profile in Tizen 3.0. Basically and consistently, two macros were used "with wayland" and "with x". Below summarize the combination of the macros: | wayland | x | meaning |--------------------------- | 0 | 1 | pure X11 platform(no wayland) | 1 | 0 | pure wayland platform (no X11) | 1 | 1 | wayland but X compatibility | 0 | 0 | no X and no wayland This method unifies the meaning and usage. Deploy this method to giflib package. Signed-off-by: wangfei <feix.w.wang@intel.com> Change-Id: Ie3ac823d5d70f5d2025149b89f501100b9a8e7e4
-rw-r--r--packaging/giflib.spec8
1 files changed, 3 insertions, 5 deletions
diff --git a/packaging/giflib.spec b/packaging/giflib.spec
index 9034c8e..dc8d42b 100644
--- a/packaging/giflib.spec
+++ b/packaging/giflib.spec
@@ -1,5 +1,5 @@
%bcond_with wayland
-
+%bcond_with x
Name: giflib
Version: 4.1.6
Release: 9
@@ -9,9 +9,7 @@ Url: http://sourceforge.net/projects/giflib/
Group: System/Libraries
Source0: http://downloads.sourceforge.net/giflib/%{name}-%{version}.tar.bz2
Source1001: giflib.manifest
-%if %{with wayland}
-
-%else
+%if %{with x}
BuildRequires: pkgconfig(x11)
BuildRequires: pkgconfig(xv)
BuildRequires: pkgconfig(ice)
@@ -60,7 +58,7 @@ cp %{SOURCE1001} .
%build
%configure \
-%if %{with wayland}
+%if %{with wayland} && !%{with x}
--disable-x11
%endif