pool/argyllcms
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 287640 from multimedia:color_management

Browse Source 
1

OBS-URL: https://build.opensuse.org/request/show/287640
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/argyllcms?expand=0&rev=16
This commit is contained in:
Dominique Leuenberger 2015-02-27 10:09:07 +00:00 committed by Git OBS Bridge
commit a983833808
2 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
argyllcms.changes
View File

@ -1,3 +1,19 @@
-------------------------------------------------------------------
Tue Feb 24 15:00:24 UTC 2015 - rguenther@suse.com
- Use -std=gnu89 for building to not run into broken __declspec
uses with the GCC 5 default of -std=gnu99.
-------------------------------------------------------------------
Mon Feb 23 13:55:20 UTC 2015 - meissner@suse.com
- allow building with udev-mini by using pkgconfig(udev)
-------------------------------------------------------------------
Mon Feb 23 13:48:38 UTC 2015 - meissner@suse.com
- do not rpm -q udev
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Feb 4 10:23:32 UTC 2015 - fcrozat@suse.com Wed Feb 4 10:23:32 UTC 2015 - fcrozat@suse.com

12
argyllcms.spec
View File

@ -16,11 +16,7 @@
# #
%if %( echo `rpm -q --queryformat %%{version} udev` ) > 190 %define _udevrulesdir %(pkg-config --variable=udevdir udev)/rules.d
%define _udevrulesdir /usr/lib/udev/rules.d
%else
%define _udevrulesdir /lib/udev/rules.d
%endif
%define archivename Argyll_V%{version}%{?alphaversion}_src.zip %define archivename Argyll_V%{version}%{?alphaversion}_src.zip
@ -58,7 +54,7 @@ BuildRequires: xorg-x11-devel
BuildRequires: bison BuildRequires: bison
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: udev BuildRequires: pkgconfig(udev)
Requires: udev Requires: udev
%if 0%{?suse_version} < 1120 %if 0%{?suse_version} < 1120
BuildRequires: hal BuildRequires: hal
@ -122,11 +118,11 @@ rm -fr usb/{*.inf,*.rtf,*.inf,*.cat,*.vcproj,*.sys,*.dsw,*.sln,*.dsp,*template*,
%build %build
cd ajam-2.5.2-1.3.3 cd ajam-2.5.2-1.3.3
make CFLAGS="${RPM_OPT_FLAGS}" make CFLAGS="-std=gnu89 ${RPM_OPT_FLAGS}"
ln -s $PWD/bin.unix/jam ../jam ln -s $PWD/bin.unix/jam ../jam
cd .. cd ..
echo "CCFLAGS += ${RPM_OPT_FLAGS} -fno-strict-aliasing ;" >> Jamtop echo "CCFLAGS += -std=gnu89 ${RPM_OPT_FLAGS} -fno-strict-aliasing ;" >> Jamtop
# Evil hack to get --as-needed working. The build system unfortunately lists all # Evil hack to get --as-needed working. The build system unfortunately lists all
# the shared libraries by default on the command line _before_ the object to be built... # the shared libraries by default on the command line _before_ the object to be built...
echo "STDLIBS += -ldl -lrt -lX11 -lXext -lXxf86vm -lXinerama -lXrandr -lXau -lXdmcp -lXss -ltiff -ljpeg ;" >> Jamtop echo "STDLIBS += -ldl -lrt -lX11 -lXext -lXxf86vm -lXinerama -lXrandr -lXau -lXdmcp -lXss -ltiff -ljpeg ;" >> Jamtop