Hello community, here is the log from the commit of package xcm for openSUSE:Factory checked in at 2017-01-27 11:05:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xcm (Old) and /work/SRC/openSUSE:Factory/.xcm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xcm" Changes: -------- --- /work/SRC/openSUSE:Factory/xcm/xcm.changes 2014-11-04 17:29:16.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.xcm.new/xcm.changes 2017-02-03 20:05:33.506552931 +0100 @@ -1,0 +2,7 @@ +Thu Dec 22 12:00:00 UTC 2016 - [email protected] - 0.5.4 + +- official release 0.5.4 +- add xcmhextobin tool +- all known bugs are fixed + +------------------------------------------------------------------- Old: ---- xcm-0.5.3.tar.bz2 New: ---- xcm-0.5.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xcm.spec ++++++ --- /var/tmp/diff_new_pack.9v0KIM/_old 2017-02-03 20:05:34.138463985 +0100 +++ /var/tmp/diff_new_pack.9v0KIM/_new 2017-02-03 20:05:34.142463423 +0100 @@ -1,7 +1,7 @@ # # spec file for package xcm # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,9 +16,9 @@ # -Version: 0.5.3 +Version: 0.5.4 Release: 0 -Source: http://sourceforge.net/projects/oyranos/files/Xcm/xcm-%{version}.tar.bz2 +Source: xcm-%{version}.tar.bz2 Summary: X Color Management tools License: MIT Group: System/X11/Utilities @@ -29,7 +29,7 @@ BuildRequires: libtool BuildRequires: pkgconfig -BuildRequires: pkgconfig(oyranos) >= 0.9.5 +BuildRequires: pkgconfig(oyranos) >= 0.9.6 BuildRequires: pkgconfig(udev) BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(xcm) @@ -40,26 +40,24 @@ BuildRequires: Mesa BuildRequires: gcc-c++ BuildRequires: libXcm-devel -BuildRequires: liboyranos-devel >= 0.9.5 +BuildRequires: liboyranos-devel >= 0.9.6 BuildRequires: libtool-devel BuildRequires: mesagl-devel BuildRequires: pkgconfig %endif %if 0%{?fedora_version} > 0 +BuildRequires: libtool-ltdl-devel +%endif +%if 0%{?fedora_version} > 0 || 0%{?rhel_version} > 0 || 0%{?centos_version} > 0 BuildRequires: Mesa BuildRequires: Mesa-devel -BuildRequires: elektra-devel BuildRequires: gcc-c++ BuildRequires: libXcm-devel BuildRequires: libXfixes-devel BuildRequires: libXmu-devel -BuildRequires: liboyranos-devel >= 0.9.5 -BuildRequires: libtool-ltdl-devel +BuildRequires: liboyranos-devel >= 0.9.6 BuildRequires: xdg-utils BuildRequires: xorg-x11-Mesa-devel -BuildRequires: xorg-x11-devel -BuildRequires: xorg-x11-proto-devel -BuildRequires: xorg-x11-xtrans-devel %endif %description @@ -86,12 +84,14 @@ %{_bindir}/%{name}events %{_bindir}/%{name}edid %{_bindir}/%{name}ddc +%{_bindir}/%{name}hextobin %{_bindir}/%{name} %{_mandir}/man1/%{name}.1* %{_mandir}/man1/%{name}ddc.1* %{_mandir}/man1/%{name}edid.1* %{_mandir}/man1/%{name}events.1* +%{_mandir}/man1/%{name}hextobin.1* %{_udevrulesdir}/90-xcm-i2c.rules -%doc AUTHORS COPYING ChangeLog README +%doc docs/AUTHORS docs/COPYING docs/ChangeLog README.md %changelog ++++++ xcm-0.5.3.tar.bz2 -> xcm-0.5.4.tar.bz2 ++++++ ++++ 2801 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xcm-0.5.3/.gitignore new/xcm-0.5.4/.gitignore --- old/xcm-0.5.3/.gitignore 1970-01-01 01:00:00.000000000 +0100 +++ new/xcm-0.5.4/.gitignore 2016-12-09 22:50:46.000000000 +0100 @@ -0,0 +1,17 @@ +Makefile +.deps/ +.libs/ +*.la +*.lo +*.o +*.log + +/autom4te.cache/ +/stamp-h1 +/config.h.in~ +/config.h +/libtool +/config.status + +*.pc +*.spec diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xcm-0.5.3/AUTHORS new/xcm-0.5.4/AUTHORS --- old/xcm-0.5.3/AUTHORS 2012-10-18 15:43:54.000000000 +0200 +++ new/xcm-0.5.4/AUTHORS 1970-01-01 01:00:00.000000000 +0100 @@ -1,2 +0,0 @@ - Kai-Uwe Behrmann <www.oyranos.org> - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xcm-0.5.3/COPYING new/xcm-0.5.4/COPYING --- old/xcm-0.5.3/COPYING 2010-10-07 11:42:31.000000000 +0200 +++ new/xcm-0.5.4/COPYING 1970-01-01 01:00:00.000000000 +0100 @@ -1,21 +0,0 @@ -License download: http://www.opensource.org/licenses/mit-license.php --------------------------------------------------------------------------------- -Copyright (c) 2009-2010, Kai-Uwe Behrmann - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xcm-0.5.3/ChangeLog new/xcm-0.5.4/ChangeLog --- old/xcm-0.5.3/ChangeLog 2012-12-22 21:03:51.000000000 +0100 +++ new/xcm-0.5.4/ChangeLog 1970-01-01 01:00:00.000000000 +0100 @@ -1,105 +0,0 @@ -Version xcm-0.5.2 - -Kai-Uwe Behrmann (3): - * [conf]: adjust xcmddc path - * [core]: return proper status in xcmddc - * [conf]: bump version to 0.5.2 - -VSE (1): - * [conf]: Fix xcm udev rule - -Version xcm-0.5.1 - -Kai-Uwe Behrmann (7): - * [conf]: add missed version info to spec file - * [build]: package udev file again - * [conf]: add --with-udev-dir configure option - * [conf]: add missing autotools files - * [build]: skip install of internal header - * [build]: switch to autotools part II - * [build]: switch to autotools part I - -Version xcm-0.5.0 - -Kai-Uwe Behrmann (31): - * [core]: add warning - * [build]: add ltdl to spec file - * [core]: fix compile warnings - * [build]: sync spec file with openSUSE - * [conf]: resolve XCM_ macro conflict - * [build]: skip X11 and LINUX build and install on osX - * [conf]: generalise OS detection for Win32 - * [docu]: describe new xcm -d option - * [conf]: support MINGW32 - * [core]: support colour region removal in xcm - * [core]: fix build without Oyranos II - * [core]: fix build without Oyranos - * [core]: add --ppmcie option to xcmedid - * [conf]: bump to 0.5 like libXcm - * [conf]: bump libXcm requirement to 0.5 - * [build]: add xcm_macros.h to package - * [core]: rename net-color spec atoms - * [core]: fix xcmedid argument order - * [core]: move cli parsing macros to header file - * [core]: fix xcm region deletion - * [docu]: fix xcm man page - * [biuld]: install xcm - * [build]: add xcm to RPM and makefile - * [docu]: add man page for xcm tool - * [core]: add --geometry option to renamed xcm tool - * [core]: add region option to xcmwindow - * [core]: use Oyranos in xcmwindow for more infos - * [core]: begin xcmwindow tool - * [build]: fix spec file - * [build]: more streamlining of spec file - * [conf]: bump version - -Version xcm-0.4.2 - -Kai-Uwe Behrmann (6): - * [docu]: man page minor fixes - * [build]: switch to bz2 compression for RPM - * [docu]: add xcmevents man page - * [core]: add JSON from EDID output - * [core]: we support DDC only on Linux - * [conf]: bump version - -Version xcm-0.4.1 - -Kai-Uwe Behrmann (10): - * [build]: rpm group is System/Libraries - * [build]: disable ddc on apple - * [build]: add XCM_H flags - * [build]: compress package with bzip2 - * [conf]: sync test script with Oyranos - * [conf]: use -fPIC only on 64bit builds - * [conf]: bump version - * [conf]: use SUBSYTEM="i2c" - * [build]: add udev to build requirements - * [docu]: update ChangeLog - -Nicolas Chauvet (2): - * [conf]: apply Fedora patch for pkg-config - * [build]: ensure the target directory for udev - -Version xcm-0.4.0 - -Kai-Uwe Behrmann (14): - * [docu]: update README - * [core]: add xcmddc --identify option - * [conf]: install and package udev rules - * [build]: install and package man pages - * [docu]: add xcmddc and xcmedid man pages - * [core]: sync help texts of xcmedid and xcmddc - * [core]: add --i2c and --force-output to xcmddc - * [docu]: fix source file header - * [build]: compile xcmddc - * [core]; add initial xcmddc tool - * [conf]: fix version macro names - * [core]: support stdin stream - * [build]: fixes for Mandriva RPMs - * [conf]: bump version - -Xcm-0.3.0 - - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xcm-0.5.3/Makefile.am new/xcm-0.5.4/Makefile.am --- old/xcm-0.5.3/Makefile.am 2012-10-18 15:43:54.000000000 +0200 +++ new/xcm-0.5.4/Makefile.am 2016-12-09 22:50:46.000000000 +0100 @@ -6,7 +6,7 @@ man_MANS = \ man/xcm.1 man/xcmddc.1 man/xcmedid.1 \ - man/xcmevents.1 + man/xcmevents.1 man/xcmhextobin.1 EXTRA_DIST = ${man_MANS} \ xcm_control.in \ @@ -61,3 +61,4 @@ echo "... DESTDIR=\"/user/a/My Install Dir/\" install" echo "... BUILDDIR=../build_local" +dist_doc_DATA = README.md docs/AUTHORS docs/ChangeLog docs/COPYING diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xcm-0.5.3/README new/xcm-0.5.4/README --- old/xcm-0.5.3/README 2010-12-30 12:57:54.000000000 +0100 +++ new/xcm-0.5.4/README 1970-01-01 01:00:00.000000000 +0100 @@ -1,23 +0,0 @@ -Xcm: - - Tools which based on libXcm, a library for colour management on X. - xcmddc requests EDID from a monitor over the i2c bus. - xcmedid is for parsing EDID data blocks. - xcmevents observes X11 colour management events. - - -Internet: - sources: git clone git://www.oyranos.org/git/xcm - www: OpenICC http://www.freedesktop.org/wiki/OpenIcc - email: http://lists.freedesktop.org/mailman/listinfo/openicc - - -Dependencies: - Xorg www.x.org libXcm - - -Building: - $ make - $ make install - - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xcm-0.5.3/README.md new/xcm-0.5.4/README.md --- old/xcm-0.5.3/README.md 1970-01-01 01:00:00.000000000 +0100 +++ new/xcm-0.5.4/README.md 2016-12-09 22:50:46.000000000 +0100 @@ -0,0 +1,26 @@ +# Xcm + +Tools which based on libXcm, a library for color management on X. +* xcmddc: requests EDID from a monitor over the i2c bus. +* xcmedid: is for parsing EDID data blocks. +* xcmhextobin: convert hex encoded strings to binary data for xcmedid +* xcmevents: observes X11 color management events. + + +## Internet +* sources: [git clone git://github.com/oyranos-cms/xcm](https://github.com/oyranos-cms/xcm) +* www: [OpenICC](http://www.openicc.info) +* support: [email list](http://lists.freedesktop.org/mailman/listinfo/openicc) + + +## Dependencies: +* [Xorg](http://www.x.org) +* [libxcm-dev](https://github.com/oyranos-cms/libxcm) +* [liboyranos-dev](https://github.com/oyranos-cms/oyranos) - optionally + + +## Building + $ make + $ make install + + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xcm-0.5.3/configure.ac new/xcm-0.5.4/configure.ac --- old/xcm-0.5.3/configure.ac 2013-04-24 11:34:59.000000000 +0200 +++ new/xcm-0.5.4/configure.ac 2016-12-09 22:50:46.000000000 +0100 @@ -1,6 +1,6 @@ define([MAJOR],[0]) define([MINOR],[5]) -define([MICRO],[3]) +define([MICRO],[4]) AC_INIT([xcm], [MAJOR.MINOR.MICRO], https://sourceforge.net/tracker/?group_id=177017&atid=879553, xcm, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xcm-0.5.3/docs/AUTHORS new/xcm-0.5.4/docs/AUTHORS --- old/xcm-0.5.3/docs/AUTHORS 1970-01-01 01:00:00.000000000 +0100 +++ new/xcm-0.5.4/docs/AUTHORS 2016-12-09 22:50:46.000000000 +0100 @@ -0,0 +1,2 @@ + Kai-Uwe Behrmann <www.oyranos.org> + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xcm-0.5.3/docs/COPYING new/xcm-0.5.4/docs/COPYING --- old/xcm-0.5.3/docs/COPYING 1970-01-01 01:00:00.000000000 +0100 +++ new/xcm-0.5.4/docs/COPYING 2016-12-09 22:50:46.000000000 +0100 @@ -0,0 +1,21 @@ +License download: http://www.opensource.org/licenses/mit-license.php +-------------------------------------------------------------------------------- +Copyright (c) 2009-2010, Kai-Uwe Behrmann + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xcm-0.5.3/docs/ChangeLog new/xcm-0.5.4/docs/ChangeLog --- old/xcm-0.5.3/docs/ChangeLog 1970-01-01 01:00:00.000000000 +0100 +++ new/xcm-0.5.4/docs/ChangeLog 2016-12-09 22:50:46.000000000 +0100 @@ -0,0 +1,143 @@ +Version xcm-0.5.4 + +Kai-Uwe Behrmann (15): + * [core]: add xcmhextobin -d option + * [docu]: update man pages and README.md + * [core]: support xrand --props edid filtering + * [core]: add xcmhextobin pipe converter + * [conf]: add .gitignore to hide intermediate files + * [core]: add xcmedid --svg option + * [conf]: auto update build system + * [conf]: update spec file + * [build]: satisfy autotools for README.md file + * [docs]: move to separate directory + * [docu]: fix typo + * [docu]: use markdown syntax for README + * [core]: update to Oyranos API changes + * [docu]: update URL's + * [conf]: bump version + +Yaroslav Shmelev (1): + xcmddc: handle --identify option right way + +Version xcm-0.5.3 + +Kai-Uwe Behrmann (12): + * [build]: fix version detection in spec file + * [build]: add _udevrulesdir + * [build]: reduce library dependencies for some binaries + * [build]: remove non needed package requirements from spec + * [core]: remove non needed macros + * [core]: show number of regions in xcm + * [core]: Fix window listing in xcm -l + * [core]: remove unused code section + * [conf]: bump version + * [core]: fix handle of x,y,width and height args + * [docu]: rename xcm delete to release + * [core]: update includes + +Version xcm-0.5.2 + +Kai-Uwe Behrmann (3): + * [conf]: adjust xcmddc path + * [core]: return proper status in xcmddc + * [conf]: bump version to 0.5.2 + +VSE (1): + * [conf]: Fix xcm udev rule + +Version xcm-0.5.1 + +Kai-Uwe Behrmann (7): + * [conf]: add missed version info to spec file + * [build]: package udev file again + * [conf]: add --with-udev-dir configure option + * [conf]: add missing autotools files + * [build]: skip install of internal header + * [build]: switch to autotools part II + * [build]: switch to autotools part I + +Version xcm-0.5.0 + +Kai-Uwe Behrmann (31): + * [core]: add warning + * [build]: add ltdl to spec file + * [core]: fix compile warnings + * [build]: sync spec file with openSUSE + * [conf]: resolve XCM_ macro conflict + * [build]: skip X11 and LINUX build and install on osX + * [conf]: generalise OS detection for Win32 + * [docu]: describe new xcm -d option + * [conf]: support MINGW32 + * [core]: support colour region removal in xcm + * [core]: fix build without Oyranos II + * [core]: fix build without Oyranos + * [core]: add --ppmcie option to xcmedid + * [conf]: bump to 0.5 like libXcm + * [conf]: bump libXcm requirement to 0.5 + * [build]: add xcm_macros.h to package + * [core]: rename net-color spec atoms + * [core]: fix xcmedid argument order + * [core]: move cli parsing macros to header file + * [core]: fix xcm region deletion + * [docu]: fix xcm man page + * [biuld]: install xcm + * [build]: add xcm to RPM and makefile + * [docu]: add man page for xcm tool + * [core]: add --geometry option to renamed xcm tool + * [core]: add region option to xcmwindow + * [core]: use Oyranos in xcmwindow for more infos + * [core]: begin xcmwindow tool + * [build]: fix spec file + * [build]: more streamlining of spec file + * [conf]: bump version + +Version xcm-0.4.2 + +Kai-Uwe Behrmann (6): + * [docu]: man page minor fixes + * [build]: switch to bz2 compression for RPM + * [docu]: add xcmevents man page + * [core]: add JSON from EDID output + * [core]: we support DDC only on Linux + * [conf]: bump version + +Version xcm-0.4.1 + +Kai-Uwe Behrmann (10): + * [build]: rpm group is System/Libraries + * [build]: disable ddc on apple + * [build]: add XCM_H flags + * [build]: compress package with bzip2 + * [conf]: sync test script with Oyranos + * [conf]: use -fPIC only on 64bit builds + * [conf]: bump version + * [conf]: use SUBSYTEM="i2c" + * [build]: add udev to build requirements + * [docu]: update ChangeLog + +Nicolas Chauvet (2): + * [conf]: apply Fedora patch for pkg-config + * [build]: ensure the target directory for udev + +Version xcm-0.4.0 + +Kai-Uwe Behrmann (14): + * [docu]: update README + * [core]: add xcmddc --identify option + * [conf]: install and package udev rules + * [build]: install and package man pages + * [docu]: add xcmddc and xcmedid man pages + * [core]: sync help texts of xcmedid and xcmddc + * [core]: add --i2c and --force-output to xcmddc + * [docu]: fix source file header + * [build]: compile xcmddc + * [core]; add initial xcmddc tool + * [conf]: fix version macro names + * [core]: support stdin stream + * [build]: fixes for Mandriva RPMs + * [conf]: bump version + +Xcm-0.3.0 + + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xcm-0.5.3/man/xcm.1 new/xcm-0.5.4/man/xcm.1 --- old/xcm-0.5.3/man/xcm.1 2013-01-13 19:40:38.000000000 +0100 +++ new/xcm-0.5.4/man/xcm.1 2016-12-09 22:50:46.000000000 +0100 @@ -1,4 +1,4 @@ -.TH xcm 1 "January 12, 2012" "User Commands" +.TH xcm 1 "November 22, 2016" "User Commands" .SH NAME xcm \- window region handling .SH SYNOPSIS @@ -89,4 +89,4 @@ .fi http://www.oyranos.org .SH "REPORTING BUGS" -at: http://sourceforge.net/tracker/?group_id=177017&atid=879553 +at: https://github.com/oyranos-cms/xcm/issues diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xcm-0.5.3/man/xcmddc.1 new/xcm-0.5.4/man/xcmddc.1 --- old/xcm-0.5.3/man/xcmddc.1 2012-10-18 15:43:54.000000000 +0200 +++ new/xcm-0.5.4/man/xcmddc.1 2016-12-09 22:50:46.000000000 +0100 @@ -1,4 +1,4 @@ -.TH xcmddc 1 "December 30, 2010" "User Commands" +.TH xcmddc 1 "November 22, 2016" "User Commands" .SH NAME xcmddc \- monitor EDID fetching over i2c .SH SYNOPSIS @@ -71,4 +71,4 @@ .fi http://www.oyranos.org .SH "REPORTING BUGS" -at: http://sourceforge.net/tracker/?group_id=177017&atid=879553 +at: https://github.com/oyranos-cms/xcm/issues diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xcm-0.5.3/man/xcmedid.1 new/xcm-0.5.4/man/xcmedid.1 --- old/xcm-0.5.3/man/xcmedid.1 2012-10-18 15:43:54.000000000 +0200 +++ new/xcm-0.5.4/man/xcmedid.1 2016-12-09 22:50:46.000000000 +0100 @@ -1,6 +1,6 @@ -.TH xcmedid 1 "September 24, 2011" "User Commands" +.TH xcmedid 1 "November 22, 2016" "User Commands" .SH NAME -xcmddc \- monitor EDID to key/value dumper +xcmedid \- monitor EDID to key/value dumper .SH SYNOPSIS \fBxcmedid\fR .fi @@ -36,4 +36,4 @@ .fi http://www.oyranos.org .SH "REPORTING BUGS" -at: http://sourceforge.net/tracker/?group_id=177017&atid=879553 +at: https://github.com/oyranos-cms/xcm/issues diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xcm-0.5.3/man/xcmevents.1 new/xcm-0.5.4/man/xcmevents.1 --- old/xcm-0.5.3/man/xcmevents.1 2012-10-18 15:43:54.000000000 +0200 +++ new/xcm-0.5.4/man/xcmevents.1 2016-12-09 22:50:46.000000000 +0100 @@ -1,4 +1,4 @@ -.TH xcmevents 1 "July 04, 2011" "User Commands" +.TH xcmevents 1 "November 22, 2016" "User Commands" .SH NAME xcmevents \- Xorg color management event observer .SH SYNOPSIS @@ -17,4 +17,4 @@ .fi http://www.oyranos.org .SH "REPORTING BUGS" -at: http://sourceforge.net/tracker/?group_id=177017&atid=879553 +at: https://github.com/oyranos-cms/xcm/issues diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xcm-0.5.3/man/xcmhextobin.1 new/xcm-0.5.4/man/xcmhextobin.1 --- old/xcm-0.5.3/man/xcmhextobin.1 1970-01-01 01:00:00.000000000 +0100 +++ new/xcm-0.5.4/man/xcmhextobin.1 2016-12-09 22:50:46.000000000 +0100 @@ -0,0 +1,39 @@ +.TH xcmhextobin 1 "November 22, 2016" "User Commands" +.SH NAME +xcmhextobin \- is a pipe converter +.SH SYNOPSIS +\fBxcmhextobin\fR [-s] [-f \fIPATTERN\fR] [-d \fINUMBER\fR] [-l \fIMAX_LENGTH\fR] [\fIHEX_FILE\fR] +.PP +\fB| xcmhextobin\fR +.fi +.SH DESCRIPTION +The xcmhextobin tool converts a hexadecimal ecoding into binary data and back. It can be used as a filter to xcmedid. +.SH EXAMPLES +.TP +Convert from Hex to Binary: +.B echo "48656C6c6f20776f726C64210a" | xcmhextobin +.PP +.TP +Convert xrandr outputs second edid: +.B xrandr --props | xcmhextobin -sf 00ffffffffffff00 -l 128 -d 1 | xcmedid --openicc +.PP +.TP +Convert ArgyllCMS DB EDID value: +.B cat ~/.config/color.jcnf | xcmhextobin -sf 00ffffffffffff00 -l 128 | xcmedid --openicc +.PP +.TP +Convert from Binary to Hex: +.B cat EDID.bin | xcmhextobin -r +.PP +.SH AUTHOR +Kai-Uwe Behrmann (ku.b (at) gmx.de) +.SH COPYRIGHT +(c) 2016, Kai-Uwe Behrmann +.fi +License: MIT <http://www.opensource.org/licenses/mit-license.php> +.SH "SEE ALSO" +xcmedid(1) libXcm(3) XcmEdidParse(3) +.fi +http://www.oyranos.org +.SH "REPORTING BUGS" +at: https://github.com/oyranos-cms/xcm/issues diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xcm-0.5.3/src/Makefile.am new/xcm-0.5.4/src/Makefile.am --- old/xcm-0.5.3/src/Makefile.am 2013-04-24 10:54:02.000000000 +0200 +++ new/xcm-0.5.4/src/Makefile.am 2016-12-09 22:50:46.000000000 +0100 @@ -23,3 +23,5 @@ ${libXmu_LIBS} $(liboyranos_LIBS) -lm endif +bin_PROGRAMS += xcmhextobin +xcmhextobin_SOURCES = xcmhextobin.c diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xcm-0.5.3/src/xcm.c new/xcm-0.5.4/src/xcm.c --- old/xcm-0.5.3/src/xcm.c 2013-02-06 13:01:41.000000000 +0100 +++ new/xcm-0.5.4/src/xcm.c 2016-12-09 22:50:46.000000000 +0100 @@ -446,7 +446,7 @@ void *(allocate_func)(size_t) ) { void * data = 0; - oyProfile_s * p = oyProfile_FromMD5( (uint32_t*)md5_hash, 0 ); + oyProfile_s * p = oyProfile_FromMD5( (uint32_t*)md5_hash, 0, 0 ); data = oyProfile_GetMem( p, size, 0, allocate_func ); oyProfile_Release( &p ); return data; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xcm-0.5.3/src/xcmddc.c new/xcm-0.5.4/src/xcmddc.c --- old/xcm-0.5.3/src/xcmddc.c 2013-02-05 07:56:19.000000000 +0100 +++ new/xcm-0.5.4/src/xcmddc.c 2016-12-09 22:50:46.000000000 +0100 @@ -174,7 +174,7 @@ if(identify != 0) { - printf( "%s\n", XcmDDCErrorToString(error)); + printf( "%d\n", error); return error; } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xcm-0.5.3/src/xcmedid.c new/xcm-0.5.4/src/xcmedid.c --- old/xcm-0.5.3/src/xcmedid.c 2013-02-05 07:56:30.000000000 +0100 +++ new/xcm-0.5.4/src/xcmedid.c 2016-12-09 22:50:46.000000000 +0100 @@ -43,6 +43,7 @@ fprintf( stderr, " %s\n", _("General options:")); fprintf( stderr, " --openicc %s\n", _("use JSON")); fprintf( stderr, " --ppmcie %s\n", _("ppcmcie compatible")); + fprintf( stderr, " --svg %s\n", _("svg compatible")); fprintf( stderr, " -v %s\n", _("verbose")); fprintf( stderr, "\n"); fprintf( stderr, "\n"); @@ -57,7 +58,8 @@ size_t size = 0, s = 0; int min_args = 1; int print_openicc_json = 0, - print_ppmcie = 0; + print_ppmcie = 0, + print_svg = 0; const char * file_name = NULL; #ifndef HAVE_OY int verbose = 0; @@ -87,6 +89,8 @@ { print_openicc_json = 1; i=100; break; } else if(OY_IS_ARG("ppmcie")) { print_ppmcie = 1; i=100; break; } + else if(OY_IS_ARG("svg")) + { print_svg = 1; i=100; break; } } printfHelp(argc, argv); exit (0); @@ -127,7 +131,7 @@ fprintf(stderr, "Error: fread %lu but should read %lu\n", s, size); } else { - fprintf(stderr, "Error: Could not open file - \"%s\"\n", argv[min_args]); + fprintf(stderr, "Error: Could not open file - \"%s\"\n", file_name); } } else { @@ -178,6 +182,61 @@ } } } + else if(print_svg) + { + XcmEdidKeyValue_s * list = 0; + int i = 0, count = 0; + err = XcmEdidParse( mem, &list, &count ); + if(list && count) + { + fprintf(stderr, "svg:\n"); + fprintf(stdout, "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n\ +<svg \n\ + xmlns:dc=\"http://purl.org/dc/elements/1.1/\"\n\ + xmlns:cc=\"http://creativecommons.org/ns#\"\n\ + xmlns:rdf=\"http://www.w3.org/1999/02/22-rdf-syntax-ns#\"\n\ + xmlns:svg=\"http://www.w3.org/2000/svg\"\n\ + xmlns=\"http://www.w3.org/2000/svg\"\n\ + version=\"1.1\"\n\ + id=\"svg2\"\n\ + viewBox=\"0 0 744.09448819 744.09448819\"\n\ + height=\"210mm\"\n\ + width=\"210mm\">\n\ + <g>\n\ + <path\n\ + d=\"M "); + for(i = 0; i < count; ++i) + { + if(strcmp(list[i].key,XCM_EDID_KEY_REDx) == 0) + { fprintf(stdout," %g,", list[i].value.dbl*744.0); fflush(stdout); } + else if(strcmp(list[i].key,XCM_EDID_KEY_REDy) == 0) + { fprintf(stdout,"%g", 744-list[i].value.dbl*744.0); fflush(stdout); } + else if(strcmp(list[i].key,XCM_EDID_KEY_GREENx) == 0) + { fprintf(stdout," %g,", list[i].value.dbl*744.0); fflush(stdout); } + else if(strcmp(list[i].key,XCM_EDID_KEY_GREENy) == 0) + { fprintf(stdout,"%g", 744-list[i].value.dbl*744.0); fflush(stdout); } + else if(strcmp(list[i].key,XCM_EDID_KEY_BLUEx) == 0) + { fprintf(stdout," %g,", list[i].value.dbl*744.0); fflush(stdout); } + else if(strcmp(list[i].key,XCM_EDID_KEY_BLUEy) == 0) + { fprintf(stdout,"%g", 744-list[i].value.dbl*744.0); fflush(stdout); } + } + fprintf(stdout, " Z\"\n\ + style=\"fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:5px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1\" />\n\ + <circle\n\ + cx=\""); + for(i = 0; i < count; ++i) + { + if(strcmp(list[i].key,XCM_EDID_KEY_WHITEx) == 0) + { fprintf(stdout,"%g\"", list[i].value.dbl*744.0); fflush(stdout); } + else if(strcmp(list[i].key,XCM_EDID_KEY_WHITEy) == 0) + { fprintf(stdout," cy=\"%g\"", 744-list[i].value.dbl*744.0); fflush(stdout); } + } + fprintf(stdout, " r=\"12.5\"\n\ + style=\"fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:5px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1\" />\n\ + </g>\n\ +</svg>"); + } + } else err = XcmEdidPrintString( mem, &txt, malloc ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xcm-0.5.3/src/xcmevents.c new/xcm-0.5.4/src/xcmevents.c --- old/xcm-0.5.3/src/xcmevents.c 2013-02-05 07:57:28.000000000 +0100 +++ new/xcm-0.5.4/src/xcmevents.c 2016-12-09 22:50:46.000000000 +0100 @@ -50,7 +50,7 @@ void *(allocate_func)(size_t) ) { void * data = 0; - oyProfile_s * p = oyProfile_FromMD5( (uint32_t*)md5_hash, 0 ); + oyProfile_s * p = oyProfile_FromMD5( (uint32_t*)md5_hash, 0, 0 ); data = oyProfile_GetMem( p, size, 0, allocate_func ); oyProfile_Release( &p ); return data; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xcm-0.5.3/src/xcmhextobin.c new/xcm-0.5.4/src/xcmhextobin.c --- old/xcm-0.5.3/src/xcmhextobin.c 1970-01-01 01:00:00.000000000 +0100 +++ new/xcm-0.5.4/src/xcmhextobin.c 2016-12-09 22:50:46.000000000 +0100 @@ -0,0 +1,248 @@ +/* gcc -Wall -g xcmhextobin.c -o xcmhextobin */ +/* gcc -Wall -g xcmhextobin.c -o xcmhextobin && oyranos-monitor -clv 2>&1 | grep ^EDID: | sed s/EDID:0x// | ./hextobin | ./hextobin -r | ./hextobin | xcmedid --openicc */ +#include <stdlib.h> +#include <stdio.h> +#include <string.h> +#include <ctype.h> +#include <stdint.h> /* uint64_t - a bit fragile */ + +#include "xcm_version.h" +#include "xcm_macros.h" + +unsigned char * oyReadStdinToMem_ ( size_t * size ) +{ + unsigned char * text = 0; + { + int text_size = 0, buf_size = 0; + int c; + unsigned char * tmp = 0; + + while(((c = getc(stdin)) != EOF)) + { + if(text_size >= buf_size-1) + { + buf_size = text_size + 65536; + tmp = calloc( sizeof(unsigned char), buf_size ); + if(text_size) + memcpy(tmp, text, text_size); + free(text); + text = tmp; tmp = 0; + } + text[text_size++] = c; + } + if(text) + text[text_size] = '\000'; + + if(size) + *size = text_size; + } + + return text; +} + +int hextobin( unsigned char c ) +{ + return c < 58 ? c - 48 : tolower(c) - 87; +} +int oyBigEndian ( void ) +{ + int big = 0; + char testc[2] = {0,0}; + uint16_t *testu = (uint16_t*)testc; + *testu = 1; + big = testc[1]; + return big; +} + +void printfHelp(int argc, char ** argv) +{ + fprintf( stderr, "\n"); + fprintf( stderr, "%s %s\n", argv[0], + _("is a pipe converter")); + fprintf( stderr, " %s\n", + PACKAGE_STRING ); + fprintf( stderr, "\n"); + fprintf( stderr, "%s\n", _("Usage")); + fprintf( stderr, " | %s\n\n", argv[0]); + fprintf( stderr, "\n"); + + + fprintf( stderr, "%s\n", _("Usage")); + fprintf( stderr, " %s\n", _("Convert from Hex to Binary:")); + fprintf( stderr, " cat EDID.txt | %s\n", argv[0]); + fprintf( stderr, " [-s] [-f %s] [-d %s] [-l %s]\n", _("PATTERN"), _("NUMBER"), _("MAX_LENGTH")); + fprintf( stderr, "\n"); + fprintf( stderr, " echo \"48656C6c6f20776f726C64210a\" | %s\n", argv[0]); + fprintf( stderr, "\n"); + fprintf( stderr, " xrandr --props | src/xcmhextobin -sf 00ffffffffffff00 -l 128 | %s --openicc\n", argv[0]); + fprintf( stderr, "\n"); + fprintf( stderr, " cat ~/.config/color.jcnf | src/xcmhextobin -sf 00ffffffffffff00 -l 128 | %s --openicc\n", argv[0]); + fprintf( stderr, "\n"); + fprintf( stderr, " oyranos-monitor -lvd 0 -f edid 2>&1 | grep EDID: | src/xcmhextobin -sf 00ffffffffffff00 -l 128 | %s --openicc\n", argv[0]); + fprintf( stderr, "\n"); + fprintf( stderr, " %s\n", _("Convert from Binary to Hex:")); + fprintf( stderr, " cat EDID.bin | %s -r\n", argv[0]); + fprintf( stderr, "\n"); + fprintf( stderr, " %s\n", _("Print a help text:")); + fprintf( stderr, " %s -h\n", argv[0]); + fprintf( stderr, "\n"); + fprintf( stderr, " %s\n", _("General options:")); + fprintf( stderr, " -r %s\n", _("reverse : binary to hexadecimal")); + fprintf( stderr, " -s %s\n", _("skip white space")); + fprintf( stderr, " -f %s\n", _("search for pattern in hexadecimal input")); + fprintf( stderr, " -d %s\n", _("search for pattern in hexadecimal input n+1 times")); + fprintf( stderr, " -v %s\n", _("verbose")); + fprintf( stderr, "\n"); + fprintf( stderr, "\n"); +} + +int main(int argc, char ** argv) +{ + size_t size = 0; + unsigned char * in; + unsigned int i, + hex2bin = 1; + int skip_space = 0, + verbose = 0, + len = 0; + const char * file_name = NULL, + * hex_filter = NULL; + int hex_filter_pos = 0; + + if(argc > 1) + { + int pos = 1, i; + char *wrong_arg = 0; + while(pos < argc) + { + switch(argv[pos][0]) + { + case '-': + for(i = 1; pos < argc && i < strlen(argv[pos]); ++i) + switch (argv[pos][i]) + { + case 'd': OY_PARSE_INT_ARG( hex_filter_pos ); break; + case 'f': OY_PARSE_STRING_ARG( hex_filter ); break; + case 'l': OY_PARSE_INT_ARG( len ); break; + case 'r': hex2bin = 0; break; + case 's': skip_space = 1; break; + case 'v': verbose += 1; break; + case '-': + if(i == 1) + { + if(OY_IS_ARG("reverse")) + { hex2bin = 0; i=100; break; } + else if(OY_IS_ARG("skip-space")) + { skip_space = 1; i=100; break; } + } + printfHelp(argc, argv); + exit (0); + break; + case '?': + case 'h': + default: + wrong_arg = argv[pos]; + break; + } + break; + default: + if(!file_name) + file_name = argv[pos]; + } + if( wrong_arg ) + { + fprintf(stderr, "%s %s\n", _("wrong argument to option:"), wrong_arg); + printfHelp(argc, argv); + exit(1); + } + ++pos; + } + + } + + if(file_name) + { + FILE * fp = fopen(file_name,"rb"); + size_t s; + if(fp) + { + fseek(fp,0L,SEEK_END); + size = ftell (fp); + rewind(fp); + in = malloc(size); + s = fread(in, sizeof(char), size, fp); + if(s != size) + fprintf(stderr, "Error: fread %lu but should read %lu\n", s, size); + } else + { + fprintf(stderr, "Error: Could not open file - \"%s\"\n", file_name); + } + } else + { + in = oyReadStdinToMem_( &size ); + } + + + + if(hex2bin) + { + char * edid = (char *) in; + int count = 0; + + if(verbose) + fprintf( stderr, "hextobin:\n"); + + if(hex_filter) + { + char * lower_hex_filter = strdup(hex_filter); + char * lower_in = strdup( (char*) in ); + + i = 0; + while(lower_hex_filter[i]) { lower_hex_filter[i] = tolower(lower_hex_filter[i]); ++i; } + i = 0; + while(lower_in[i]) { lower_in[i] = tolower(lower_in[i]); ++i; } + + edid = strstr( (char*)lower_in, lower_hex_filter ); + for(i = 0; i < hex_filter_pos && edid; ++i) + edid = strstr( (char*)edid+1, lower_hex_filter ); + if(verbose && edid) + fprintf( stderr, "filter:%s\n", edid); + + if(edid) + in = (unsigned char*) edid; + } + + for(i = 0; i < size; ++i) + { + int c; + + if(skip_space) + while( i < size && isspace(in[i]) ) ++i; + + if(!oyBigEndian()) + c = (hextobin( in[i] ) << 4) | hextobin( in[i+1] ); + else + c = hextobin( in[i] ) | (hextobin( in[i+1] ) << 4); + ++i; + + putchar( c ); + + if(len && ++count >= len) + break; + } + } + else + { + if(verbose) + fprintf( stderr, "bintohex:\n"); + + for(i = 0; i < size; ++i) + { + char hex[4] = {0,0,0,0}; + sprintf( hex, "%02X", in[i] ); + printf( "%s", hex ); + } + } + + return 0; +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xcm-0.5.3/tests/dl_test.cxx new/xcm-0.5.4/tests/dl_test.cxx --- old/xcm-0.5.3/tests/dl_test.cxx 1970-01-01 01:00:00.000000000 +0100 +++ new/xcm-0.5.4/tests/dl_test.cxx 2016-12-09 22:50:46.000000000 +0100 @@ -0,0 +1,7 @@ +#include <dlfcn.h> + +int main(void) +{ + dlopen("/lib/libm.so", RTLD_LAZY); + return 0; +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xcm-0.5.3/tests/intptr_test.c new/xcm-0.5.4/tests/intptr_test.c --- old/xcm-0.5.3/tests/intptr_test.c 1970-01-01 01:00:00.000000000 +0100 +++ new/xcm-0.5.4/tests/intptr_test.c 2016-12-09 22:50:46.000000000 +0100 @@ -0,0 +1,6 @@ +#include <unistd.h> /* intptr_t */ +int main(void) +{ + intptr_t ip; + return sizeof(ip); +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xcm-0.5.3/tests/lib_test.cxx new/xcm-0.5.4/tests/lib_test.cxx --- old/xcm-0.5.3/tests/lib_test.cxx 1970-01-01 01:00:00.000000000 +0100 +++ new/xcm-0.5.4/tests/lib_test.cxx 2016-12-09 22:50:46.000000000 +0100 @@ -0,0 +1,5 @@ + +int main(void) +{ + return 0; +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xcm-0.5.3/tests/library.c new/xcm-0.5.4/tests/library.c --- old/xcm-0.5.3/tests/library.c 1970-01-01 01:00:00.000000000 +0100 +++ new/xcm-0.5.4/tests/library.c 2016-12-09 22:50:46.000000000 +0100 @@ -0,0 +1,4 @@ + +int some_function( void ) +{ int a = 0; + a = 1; return a; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xcm-0.5.3/xcm.spec.in new/xcm-0.5.4/xcm.spec.in --- old/xcm-0.5.3/xcm.spec.in 2013-04-25 12:31:18.000000000 +0200 +++ new/xcm-0.5.4/xcm.spec.in 2016-12-09 22:50:46.000000000 +0100 @@ -1,4 +1,6 @@ -%if %( echo `rpm -q --queryformat %%{version} udev` ) > 190 +%define _udev_version %(rpm -q --queryformat %%{VERSION} udev) + +%if 0%{_udev_version} > 190 %define _udevrulesdir /usr/lib/udev/rules.d %else %define _udevrulesdir /lib/udev/rules.d @@ -16,6 +18,7 @@ Vendor: Kai-Uwe Behrmann BuildRoot: %{_tmppath}/%{name}-%{version}-build +#BuildRequires: liboyranos-devel >= 0.9.3 BuildRequires: udev %if 0%{?suse_version} > 0 @@ -30,7 +33,6 @@ BuildRequires: Mesa-devel BuildRequires: gcc-c++ BuildRequires: libXcm-devel -BuildRequires: liboyranos-devel >= 0.9.3 BuildRequires: pkgconfig BuildRequires: xorg-x11 BuildRequires: xorg-x11-devel @@ -46,7 +48,6 @@ BuildRequires: Mesa BuildRequires: gcc-c++ BuildRequires: libXcm-devel -BuildRequires: liboyranos-devel >= 0.9.3 BuildRequires: libtool-devel BuildRequires: mesagl-devel BuildRequires: pkgconfig @@ -59,7 +60,6 @@ BuildRequires: libXcm-devel BuildRequires: libXfixes-devel BuildRequires: libXmu-devel -BuildRequires: liboyranos-devel >= 0.9.3 BuildRequires: libtool-ltdl-devel BuildRequires: xdg-utils BuildRequires: xorg-x11-Mesa-devel @@ -99,7 +99,7 @@ %{_mandir}/man1/%{name}edid.1* %{_mandir}/man1/%{name}events.1* %{_udevrulesdir}/90-xcm-i2c.rules -%doc AUTHORS COPYING ChangeLog README +%doc docs/AUTHORS docs/COPYING docs/ChangeLog README.md %changelog
