Hello community, here is the log from the commit of package icc_examin for openSUSE:Factory checked in at 2013-01-31 16:44:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/icc_examin (Old) and /work/SRC/openSUSE:Factory/.icc_examin.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "icc_examin", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/icc_examin/icc_examin.changes 2012-11-17 07:21:46.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.icc_examin.new/icc_examin.changes 2013-01-31 16:44:41.000000000 +0100 @@ -1,0 +2,10 @@ +Fri Dec 21 12:00:00 UTC 2012 - [email protected] + +- release 0.53 +- remove recommendation to oy-monitor-nvidia +- fix compiling on Fedora 17 +- rename FLTK functions to internal names +- use editing space only with colour server +- remove debian section in spec file + +------------------------------------------------------------------- Old: ---- icc_examin-0.52.tar.bz2 New: ---- icc-examin_0.53-1.debian.tar.gz icc-examin_0.53-1.dsc icc-examin_0.53.orig.tar.bz2 icc_examin-0.53.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ icc_examin.spec ++++++ --- /var/tmp/diff_new_pack.3eJBNa/_old 2013-01-31 16:44:43.000000000 +0100 +++ /var/tmp/diff_new_pack.3eJBNa/_new 2013-01-31 16:44:43.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package icc_examin # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products 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.52 +Version: 0.53 Release: 0 -Source: icc_examin-0.52.tar.bz2 +Source: icc_examin-%{version}.tar.bz2 %define pixmapdir /usr/share/pixmaps %define desktopdir /usr/share/applications Summary: ICC profile viewer and colour visualisation @@ -61,7 +61,7 @@ %endif %if 0%{?suse_version} > 1010 -Recommends: oyranos-monitor-nvidia freefont +Recommends: freefont BuildRequires: Mesa BuildRequires: Mesa-devel BuildRequires: liblcms-devel @@ -113,7 +113,6 @@ %endif %if 0%{?mandriva_version} > 0 -Recommends: oyranos-monitor-nvidia BuildRequires: Mesa BuildRequires: X11-devel BuildRequires: lcms-devel @@ -123,7 +122,6 @@ %endif %if 0%{?fedora_version} > 0 -Recommends: oyranos-monitor-nvidia BuildRequires: Mesa-devel BuildRequires: elektra-devel BuildRequires: lcms-devel @@ -137,17 +135,6 @@ BuildRequires: xorg-x11-devel %endif -%if 0%{?debian_version} > 0 -BuildRequires: cinepaint-devel-0.25 -BuildRequires: xorg-x11 -BuildRequires: xorg-x11-Mesa-devel -BuildRequires: xorg-x11-devel -BuildRequires: xorg-x11-libXext -BuildRequires: xorg-x11-libXext-devel -BuildRequires: xorg-x11-libXpm -BuildRequires: xorg-x11-libXpm-devel -%endif - %description ICC Examin is a small utility (unix name: iccexamin) for the purpose of watching the internals of ICC profiles, measurement ++++++ icc-examin_0.53-1.dsc ++++++ Format: 3.0 (quilt) Source: icc-examin Binary: icc-examin Architecture: any Version: 0.53-1 Maintainer: Kai-Uwe Behrmann (oy) <[email protected]> Homepage: http://www.oyranos.org/icc_examin Standards-Version: 3.9.3 Vcs-Browser: http://www.oyranos.org/scm?p=icc_examin.git;a=summary Vcs-Git: git://www.oyranos.org/git/icc_examin Build-Depends: debhelper (>= 8.0.0), autotools-dev, autoconf, cmake, gettext, libfltk-dev, liboyranos-dev, x11proto-xf86vidmode-dev, x11proto-xext-dev, libxxf86vm-dev, libxrandr-dev, libxinerama-dev, libxmu-dev, libxpm-dev, libxfixes-dev, libxcm-dev, libglu1-mesa-dev, pkg-config, locales, libfreetype6-dev Package-List: icc-examin deb graphics optional Checksums-Sha1: c6bcafc097b3cedd2f803a75339cfae6ce477e4e 594382 icc-examin_0.53.orig.tar.bz2 df399ece9b83c32ad0d42cdf865017102107cda2 2746 icc-examin_0.53-1.debian.tar.gz Checksums-Sha256: 2e64a969768f705534e0e564d1947f98a75b9d04effeb8f673b85eb4e930525e 594382 icc-examin_0.53.orig.tar.bz2 92072fe3b2f9968dd104c501a9e4298a0494166e13d39c86c299f0c50dd85957 2746 icc-examin_0.53-1.debian.tar.gz Files: f4cf11cde6ac8d04919ee206b67ce554 594382 icc-examin_0.53.orig.tar.bz2 e1087d4e8c819e32418243fead959d97 2746 icc-examin_0.53-1.debian.tar.gz ++++++ icc_examin-0.52.tar.bz2 -> icc_examin-0.53.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/icc_examin-0.52/configure new/icc_examin-0.53/configure --- old/icc_examin-0.52/configure 2012-10-24 17:37:16.000000000 +0200 +++ new/icc_examin-0.53/configure 2012-12-20 18:38:30.000000000 +0100 @@ -37,11 +37,11 @@ VERSION_A=0 VERSION_B=5 -VERSION_C=2 +VERSION_C=3 RELEASE=0 START_MONTH="May" START_YEAR="2004" -DEVEL_MONTH="October" +DEVEL_MONTH="December" DEVEL_YEAR="2012" GIT_MASTER="`cat $ROOT_DIR/.git/refs/heads/master`" time="`date +%y%m%d.%H%M%S`" @@ -697,7 +697,7 @@ echo_=""; echo "$echo_" >> $CONF_LOG; echo "$echo_" LIBS_TEST="dl iconv intl c m pthread"; export LIBS_TEST -X_ADD="Xpm Xext Xinerama Xxf86vm"; export X_ADD +X_ADD="Xpm Xext Xinerama Xxf86vm X11"; export X_ADD ECHO="echo"; export ECHO diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/icc_examin-0.52/flstring.c new/icc_examin-0.53/flstring.c --- old/icc_examin-0.52/flstring.c 2008-03-07 07:54:07.000000000 +0100 +++ new/icc_examin-0.53/flstring.c 2012-12-20 11:32:26.000000000 +0100 @@ -33,7 +33,7 @@ */ size_t /* O - Length of string */ -fl_strlcat(char *dst, /* O - Destination string */ +oy_fl_strlcat(char *dst, /* O - Destination string */ const char *src, /* I - Source string */ size_t size) { /* I - Size of destination string buffer */ size_t srclen; /* Length of source string */ @@ -73,7 +73,7 @@ */ size_t /* O - Length of string */ -fl_strlcpy(char *dst, /* O - Destination string */ +oy_fl_strlcpy(char *dst, /* O - Destination string */ const char *src, /* I - Source string */ size_t size) { /* I - Size of destination string buffer */ size_t srclen; /* Length of source string */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/icc_examin-0.52/flstring.h new/icc_examin-0.53/flstring.h --- old/icc_examin-0.52/flstring.h 2008-03-07 07:53:55.000000000 +0100 +++ new/icc_examin-0.53/flstring.h 2012-12-20 11:32:36.000000000 +0100 @@ -95,14 +95,14 @@ * that work the way strncpy() and strncat() *should* have worked. */ -FL_EXPORT extern size_t fl_strlcat(char *, const char *, size_t); +FL_EXPORT extern size_t oy_fl_strlcat(char *, const char *, size_t); # if !HAVE_STRLCAT && !defined(strlcat) -# define strlcat fl_strlcat +# define strlcat oy_fl_strlcat # endif /* !HAVE_STRLCAT */ -FL_EXPORT extern size_t fl_strlcpy(char *, const char *, size_t); +FL_EXPORT extern size_t oy_fl_strlcpy(char *, const char *, size_t); # if !HAVE_STRLCPY && !defined(strlcpy) -# define strlcpy fl_strlcpy +# define strlcpy oy_fl_strlcpy # endif /* !HAVE_STRLCPY */ # ifdef __cplusplus diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/icc_examin-0.52/icc_examin.spec.in new/icc_examin-0.53/icc_examin.spec.in --- old/icc_examin-0.52/icc_examin.spec.in 2012-06-14 15:09:01.000000000 +0200 +++ new/icc_examin-0.53/icc_examin.spec.in 2012-12-21 11:09:46.000000000 +0100 @@ -36,7 +36,6 @@ %endif %if 0%{?suse_version} > 1010 -Recommends: oyranos-monitor-nvidia >= 0.4.0 freefont BuildRequires: Mesa BuildRequires: Mesa-devel BuildRequires: xorg-x11-fonts-devel @@ -84,7 +83,6 @@ %endif %if 0%{?mandriva_version} > 0 -Recommends: oyranos-monitor-nvidia >= 0.4.0 BuildRequires: Mesa BuildRequires: X11-devel BuildRequires: lcms-devel @@ -94,7 +92,6 @@ %endif %if 0%{?fedora_version} > 0 -Recommends: oyranos-monitor-nvidia >= 0.4.0 BuildRequires: Mesa-devel BuildRequires: elektra-devel BuildRequires: lcms-devel @@ -108,17 +105,6 @@ BuildRequires: xorg-x11-devel %endif -%if 0%{?debian_version} > 0 -BuildRequires: cinepaint-devel-0.25 -BuildRequires: xorg-x11 -BuildRequires: xorg-x11-Mesa-devel -BuildRequires: xorg-x11-devel -BuildRequires: xorg-x11-libXext -BuildRequires: xorg-x11-libXext-devel -BuildRequires: xorg-x11-libXpm -BuildRequires: xorg-x11-libXpm-devel -%endif - %description ICC Examin is a small utility (unix name: iccexamin) for the purpose of watching the internals of ICC profiles, measurement diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/icc_examin-0.52/icc_gl.cpp new/icc_examin-0.53/icc_gl.cpp --- old/icc_examin-0.52/icc_gl.cpp 2012-10-22 13:52:21.000000000 +0200 +++ new/icc_examin-0.53/icc_gl.cpp 2012-12-20 13:54:27.000000000 +0100 @@ -131,7 +131,7 @@ oyOptions_s * opts = icc_examin->options(); \ double * rgb = icc_oyranos.wandelLabNachBildschirmFarben( \ window()->x() + window()->w()/2, window()->y() + window()->h()/2, \ - (icc_oyranos.colourServerActive() & XCM_COLOR_SERVER_PROFILES)?edit_:0, \ + (icc_oyranos.colourServerActive() & XCM_COLOR_SERVER_MANAGEMENT)?edit_:0, \ lab, 1, opts); \ for(int i = 0; i < 3; ++i) \ colour[i] = rgb[i]; \ @@ -1148,7 +1148,7 @@ oyOptions_s * opts = icc_examin->options(); double * rgb = icc_oyranos.wandelLabNachBildschirmFarben( window()->x() + window()->w()/2, window()->y() + window()->h()/2, - (icc_oyranos.colourServerActive() & XCM_COLOR_SERVER_PROFILES)?edit_:0, + (icc_oyranos.colourServerActive() & XCM_COLOR_SERVER_MANAGEMENT)?edit_:0, lab, 1, opts); glClearColor(rgb[0],rgb[1],rgb[2],1.0); delete [] rgb; oyOptions_Release( &opts ); @@ -2174,7 +2174,7 @@ int y = this->window()->y() + this->window()->h()/2; oyProfile_s * prof_disp = NULL; - if(icc_oyranos.colourServerActive() & XCM_COLOR_SERVER_PROFILES) + if(icc_oyranos.colourServerActive() & XCM_COLOR_SERVER_MANAGEMENT) prof_disp = oyProfile_Copy( edit_, NULL ); else prof_disp = icc_oyranos.oyMoni(x,y); @@ -2457,7 +2457,7 @@ RGB_buffer = icc_oyranos.wandelLabNachBildschirmFarben( window()->x() + window()->w()/2, window()->y() + window()->h()/2, - (icc_oyranos.colourServerActive() & XCM_COLOR_SERVER_PROFILES)?edit_:0, + (icc_oyranos.colourServerActive() & XCM_COLOR_SERVER_MANAGEMENT)?edit_:0, Lab_buffer, (size_t)n, opts); DBG_PROG_V( n ) // create shadow @@ -2471,7 +2471,7 @@ RGB_shadow_buffer = icc_oyranos.wandelLabNachBildschirmFarben( window()->x() + window()->w()/2, window()->y() + window()->h()/2, - (icc_oyranos.colourServerActive() & XCM_COLOR_SERVER_PROFILES)?edit_:0, + (icc_oyranos.colourServerActive() & XCM_COLOR_SERVER_MANAGEMENT)?edit_:0, Lab_shadow_buffer, n, opts); if(!RGB_buffer) WARN_S( "RGB_speicher result is not available" ) if(!RGB_shadow_buffer) WARN_S( "RGB_speicher result is not available" ) @@ -2615,7 +2615,7 @@ RGB_buffer = icc_oyranos.wandelLabNachBildschirmFarben( window()->x() + window()->w()/2, window()->y() + window()->h()/2, - (icc_oyranos.colourServerActive() & XCM_COLOR_SERVER_PROFILES)?edit_:0, + (icc_oyranos.colourServerActive() & XCM_COLOR_SERVER_MANAGEMENT)?edit_:0, Lab_buffer, (size_t)n_punkte, opts); if(type_ == 1) @@ -2635,7 +2635,7 @@ RGB_shadow_buffer = icc_oyranos.wandelLabNachBildschirmFarben( window()->x() + window()->w()/2, window()->y() + window()->h()/2, - (icc_oyranos.colourServerActive() & XCM_COLOR_SERVER_PROFILES)?edit_:0, + (icc_oyranos.colourServerActive() & XCM_COLOR_SERVER_MANAGEMENT)?edit_:0, Lab_shadow_buffer, n_punkte, opts); if(!RGB_buffer || !RGB_shadow_buffer) { @@ -2872,7 +2872,7 @@ glViewport(0,0,w(),h()); DBG_PROG_V( x()<<" "<< y()<<" "<<w()<<" "<<h()) window_proportion = (GLdouble)w()/(GLdouble)h(); - if(icc_oyranos.colourServerActive() & XCM_COLOR_SERVER_PROFILES && + if(icc_oyranos.colourServerActive() & XCM_COLOR_SERVER_MANAGEMENT && type_ != 1) icc_oyranos.colourServerRegionSet( this, edit_, window_geometry, 0 ); oyRectangle_SetGeo( window_geometry, x(), y(), w(), h() ); @@ -3051,7 +3051,7 @@ { rgb_ = rgb = icc_oyranos.wandelLabNachBildschirmFarben( window()->x() + window()->w()/2, window()->y() + window()->h()/2, - (icc_oyranos.colourServerActive() & XCM_COLOR_SERVER_PROFILES)?edit_:0, + (icc_oyranos.colourServerActive() & XCM_COLOR_SERVER_MANAGEMENT)?edit_:0, l, 1, opts); icc_examin->statusFarbe(l[0],l[1],l[2]); @@ -3645,7 +3645,7 @@ #ifdef USE_OY_NC oyProfile_s * prof = oyProfile_FromStd( oyEDITING_LAB, 0 ); oyProfile_s * prof_disp = NULL; - if(icc_oyranos.colourServerActive() & XCM_COLOR_SERVER_PROFILES) + if(icc_oyranos.colourServerActive() & XCM_COLOR_SERVER_MANAGEMENT) prof_disp = oyProfile_Copy( edit_, NULL ); else prof_disp = icc_oyranos.icc_oyranos.oyMoni( @@ -3689,7 +3689,7 @@ double * rgb = NULL; rgb = icc_oyranos.wandelLabNachBildschirmFarben( window()->x() + window()->w()/2, window()->y() + window()->h()/2, - (icc_oyranos.colourServerActive() & XCM_COLOR_SERVER_PROFILES)?edit_:0, + (icc_oyranos.colourServerActive() & XCM_COLOR_SERVER_MANAGEMENT)?edit_:0, lab, 1, opts); if(rgb) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/icc_examin-0.52/icc_oyranos.cpp new/icc_examin-0.53/icc_oyranos.cpp --- old/icc_examin-0.52/icc_oyranos.cpp 2012-10-22 13:52:21.000000000 +0200 +++ new/icc_examin-0.53/icc_oyranos.cpp 2012-12-20 13:56:58.000000000 +0100 @@ -981,6 +981,7 @@ #include "icc_vrml.h" #include "icc_gamut.h" +extern "C" {void * cnew(size_t s){return new char[s];}} void Oyranos::netzVonProfil (ICCprofile & profil, oyOptions_s * options, int native, ICCnetz & netz) @@ -990,7 +991,9 @@ if(profil.valid()) { size_t groesse = 0; - char* daten = profil.saveProfileToMem(&groesse); + oyProfile_s * p = profil.oyProfile(); + char * daten = (char*)oyProfile_GetMem( p, &groesse, 0, cnew ); + oyProfile_Release( &p ); s.ladeUndFreePtr(&daten, groesse); DBG_NUM_V( groesse ); } @@ -1624,6 +1627,10 @@ if(!editing) { + if(!(colourServerActive() | (XCM_COLOR_SERVER_REGIONS && + XCM_COLOR_SERVER_PROFILES))) + return oyProfile_FromStd( oyASSUMED_WEB, 0 ); + oyOption_s *matrix = oyOption_FromRegistration("///colour_matrix." "from_primaries." "redx_redy_greenx_greeny_bluex_bluey_whitex_whitey_gamma", NULL ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/icc_examin-0.52/makefile.in new/icc_examin-0.53/makefile.in --- old/icc_examin-0.52/makefile.in 2012-10-18 09:37:42.000000000 +0200 +++ new/icc_examin-0.53/makefile.in 2012-12-21 11:35:09.000000000 +0100 @@ -1,3 +1,4 @@ +DEBTARGET = icc-examin COLLECT = ar cru RANLIB = ranlib @@ -356,8 +357,8 @@ test: icc_formeln.o icc_utils.o $(CXX) $(CXXFLAGS_) $(INCL) -o dE2000_test.o \ - -c $(SRCDIR)tests/dE2000_test.cpp - $(CXX) $(CXXFLAGS_) -o dE2000_test dE2000_test.o icc_formeln.o icc_utils.o \ + -c $(SRCDIR)/tests/dE2000_test.cpp + $(CXX) $(CXXFLAGS_) -o dE2000_test dE2000_test.o icc_formeln.o \ -L$(libdir) $(REZ) @@ -557,6 +558,32 @@ @echo "============================================================" @echo "Finished - the Packages are in rpmdir/RPMS and rpmdir/SRPMS!" +deb: dist + $(SRCDIR)/configure --prefix=/usr --rpm-only + mkdir -p debian/deb/DEBIAN + tar xvjf $(TARGET)-$(VERSION).tar.bz2 + (cd $(TARGET)-$(VERSION); \ + ./configure --prefix=/usr; \ + $(MAKE) "DESTDIR=$(build_dir)/debian/deb/DEBIAN" install;) + $(COPY) $(TARGET)-$(VERSION)/$(TARGET)_control $(build_dir)/debian/deb/DEBIAN/control + $(RM) -R $(TARGET)-$(VERSION) + dpkg -b $(build_dir)/debian/deb debian/$(TARGET)_$(VERSION)-$(RELEASE)_$(deb_arch).deb + $(RM) -R $(build_dir)/debian/deb + echo ... $@ done + +debsrc: dist + test -d $(DEBTARGET)-$(VERSION) && $(RM) -R $(DEBTARGET)-$(VERSION) || echo "" + tar xvjf $(TARGET)-$(VERSION).tar.bz2 + mv $(TARGET)-$(VERSION)/ $(DEBTARGET)-$(VERSION) + cp -R $(SRCDIR)/extras/debian $(DEBTARGET)-$(VERSION) + tar cjf $(DEBTARGET)_$(VERSION).orig.tar.bz2 $(DEBTARGET)-$(VERSION)/ + dpkg-source -b $(DEBTARGET)-$(VERSION) + echo ... $@ done + +debian: debsrc + (cd $(DEBTARGET)-$(VERSION)/debian; debuild) + echo ... $@ done + install: $(INSTALL_TARGET) install_cp: @@ -565,7 +592,7 @@ $(INSTALL) -m 755 $(CINEPAINT) $(DESTDIR)$(CP_DIR) #strip $(DESTDIR)$(bindir)/$(CINEPAINT) mkdir -p $(DESTDIR)$(datadir)/fonts/ - $(INSTALL) -m 644 $(FONT) $(DESTDIR)$(datadir)/fonts/$(FONT) + $(INSTALL) -m 644 $(SRCDIR)/$(FONT) $(DESTDIR)$(datadir)/fonts/$(FONT) $(fltkconfig) --post $(DESTDIR)$(CP_DIR)/$(CINEPAINT) mkdir -p $(DESTDIR)$(datadir)/fonts/ echo ... Installation finished @@ -589,17 +616,17 @@ #strip $(DESTDIR)$(bindir)/$(BINTARGET) $(fltkconfig) --post $(DESTDIR)$(bindir)/$(BINTARGET) mkdir -p $(DESTDIR)$(datadir)/fonts/ - $(INSTALL) -m 644 $(FONT) $(DESTDIR)$(datadir)/fonts/$(FONT) + $(INSTALL) -m 644 $(SRCDIR)/$(FONT) $(DESTDIR)$(datadir)/fonts/$(FONT) mkdir -p $(DESTDIR)$(desktopdir) - $(COPY) icc_examin.desktop iccexamin.desktop + $(COPY) $(SRCDIR)/icc_examin.desktop iccexamin.desktop $(INSTALL) -m 644 iccexamin.desktop $(DESTDIR)$(desktopdir)/iccexamin.desktop -xdg-desktop-menu install --novendor iccexamin.desktop mkdir -p $(DESTDIR)$(datadir)/mime/packages/ mkdir -p $(DESTDIR)$(pixmapdir)/hicolor/scalable/ - #$(INSTALL) -m 644 icc_examin.png $(DESTDIR)$(pixmapdir)/iccexamin.png - $(COPY) icc_examin.png iccexamin.png + #$(INSTALL) -m 644 $(SRCDIR)/icc_examin.png $(DESTDIR)$(pixmapdir)/iccexamin.png + $(COPY) $(SRCDIR)/icc_examin.png iccexamin.png $(INSTALL) -m 644 iccexamin.png $(DESTDIR)$(pixmapdir)/iccexamin.png - $(INSTALL) -m 644 icc_examin.svg $(DESTDIR)$(pixmapdir)/hicolor/scalable/iccexamin.svg + $(INSTALL) -m 644 $(SRCDIR)/icc_examin.svg $(DESTDIR)$(pixmapdir)/hicolor/scalable/iccexamin.svg -xdg-icon-resource install --size 128 --novendor iccexamin.png echo Linguas ... for ling in $(LINGUAS); do \ -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
