packages: lensfun/lensfun-build.patch, lensfun/lensfun.spec - up to 0.2.5 -...
draenog
draenog at pld-linux.org
Mon Jun 28 01:24:54 CEST 2010
Author: draenog Date: Sun Jun 27 23:24:54 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- up to 0.2.5
- correct license
- add TODO
---- Files affected:
packages/lensfun:
lensfun-build.patch (1.1 -> 1.2) , lensfun.spec (1.3 -> 1.4)
---- Diffs:
================================================================
Index: packages/lensfun/lensfun-build.patch
diff -u packages/lensfun/lensfun-build.patch:1.1 packages/lensfun/lensfun-build.patch:1.2
--- packages/lensfun/lensfun-build.patch:1.1 Wed Nov 19 19:27:45 2008
+++ packages/lensfun/lensfun-build.patch Mon Jun 28 01:24:49 2010
@@ -1,5 +1,5 @@
---- lensfun-0.2.3/ac.py~orig 2008-07-14 21:28:32.000000000 +0200
-+++ lensfun-0.2.3/ac.py 2008-11-19 18:51:55.000000000 +0100
+--- lensfun-0.2.3/tibs.py~orig 2008-07-14 21:28:32.000000000 +0200
++++ lensfun-0.2.3/tibs.py 2008-11-19 18:51:55.000000000 +0100
@@ -301,7 +301,6 @@
add_config_h ("PLATFORM_" + TARGET [0].upper ())
@@ -8,49 +8,49 @@
add_config_mak ("HOST", HOST [0])
add_config_mak ("TARGET", TARGET [0])
---- lensfun-0.2.3/ac.py~orig 2008-11-19 18:56:06.000000000 +0100
-+++ lensfun-0.2.3/ac.py 2008-11-19 18:56:54.000000000 +0100
+--- lensfun-0.2.3/tibs.py~orig 2008-11-19 18:56:06.000000000 +0100
++++ lensfun-0.2.3/tibs.py 2008-11-19 18:56:54.000000000 +0100
@@ -142,7 +142,6 @@
add_config_h ("CONF_SYMBOL_VISIBILITY")
check_cflags ("-Wno-non-virtual-dtor", "CXXFLAGS", "-Werror")
- check_cflags ("-mtune=" + TARGET [2], "CFLAGS")
- try:
- self.sse_supported.index (TARGET [2])
- if check_cflags ("-mfpmath=sse", "CFLAGS"):
---- lensfun-0.2.3/build/mak/compiler/gcc.mak~orig 2008-05-11 17:50:15.000000000 +0200
-+++ lensfun-0.2.3/build/mak/compiler/gcc.mak 2008-11-19 19:03:12.000000000 +0100
+
+ add_config_mak ("GCC.CC", self.CC + " -c")
+ add_config_mak ("GCC.CXX", self.CXX + " -c")
+--- lensfun-0.2.3/build/tibs/compiler/gcc.mak~orig 2008-05-11 17:50:15.000000000 +0200
++++ lensfun-0.2.3/build/tibs/compiler/gcc.mak 2008-11-19 19:03:12.000000000 +0100
@@ -71,7 +71,7 @@
endef
LINK.GCC.AR = $(GCC.AR) $(GCC.ARFLAGS) $@ $^
-LINK.GCC.EXEC = $(GCC.LD) -o $@ $(GCC.LDFLAGS) $(LDFLAGS) $1 $^ $(GCC.LDFLAGS.LIBS) $(LDFLAGS.LIBS) $2
+LINK.GCC.EXEC = $(GCC.LD) -o $@ $(GCC.LDFLAGS) $(LDFLAGS) $^ $1 $(GCC.LDFLAGS.LIBS) $(LDFLAGS.LIBS) $2
- define LINK.GCC.SO
+ define LINK.GCC.SO.VER
$(GCC.LD) -o $@.$(SHARED.$3) -Wl,"-soname=$(notdir $@).$(basename $(basename $(SHARED.$3)))" $(GCC.LDFLAGS.SHARED) $(GCC.LDFLAGS) $(LDFLAGS) $1 $^ $(GCC.LDFLAGS.LIBS) $(LDFLAGS.LIBS) $2
ln -fs $(notdir $@.$(SHARED.$3)) $@.$(basename $(basename $(SHARED.$3)))
---- lensfun-0.2.3/build/mak/compiler/gcc.mak~orig 2008-11-19 19:05:55.000000000 +0100
-+++ lensfun-0.2.3/build/mak/compiler/gcc.mak 2008-11-19 19:09:17.000000000 +0100
+--- lensfun-0.2.3/build/tibs/compiler/gcc.mak~orig 2008-11-19 19:05:55.000000000 +0100
++++ lensfun-0.2.3/build/tibs/compiler/gcc.mak 2008-11-19 19:09:17.000000000 +0100
@@ -73,9 +73,8 @@
LINK.GCC.AR = $(GCC.AR) $(GCC.ARFLAGS) $@ $^
LINK.GCC.EXEC = $(GCC.LD) -o $@ $(GCC.LDFLAGS) $(LDFLAGS) $^ $1 $(GCC.LDFLAGS.LIBS) $(LDFLAGS.LIBS) $2
- define LINK.GCC.SO
-- $(GCC.LD) -o $@.$(SHARED.$3) -Wl,"-soname=$(notdir $@).$(basename $(basename $(SHARED.$3)))" $(GCC.LDFLAGS.SHARED) $(GCC.LDFLAGS) $(LDFLAGS) $1 $^ $(GCC.LDFLAGS.LIBS) $(LDFLAGS.LIBS) $2
+ define LINK.GCC.SO.VER
+- $(GCC.LD) -o $@.$(SHARED.$3) $(call GCC.LDFLAGS.SHARED,$(notdir $@).$(basename $(basename $(SHARED.$3))),$(dir $@)) $(GCC.LDFLAGS) $(LDFLAGS) $1 $^ $(GCC.LDFLAGS.LIBS) $(LDFLAGS.LIBS) $2
- ln -fs $(notdir $@.$(SHARED.$3)) $@.$(basename $(basename $(SHARED.$3)))
- ln -fs $(notdir $@.$(basename $(basename $(SHARED.$3)))) $@
-+ $(GCC.LD) -o $@.$(SHARED.$3) -Wl,"-soname=$(notdir $@).$(basename $(basename $(SHARED.$3)))" $(GCC.LDFLAGS.SHARED) $(GCC.LDFLAGS) $(LDFLAGS) $^ $1 $(GCC.LDFLAGS.LIBS) $(LDFLAGS.LIBS) $2
++ $(GCC.LD) -o $@.$(SHARED.$3) $(call GCC.LDFLAGS.SHARED,$(notdir $@).$(basename $(basename $(SHARED.$3))),$(dir $@)) $(GCC.LDFLAGS) $(LDFLAGS) $^ $1 $(GCC.LDFLAGS.LIBS) $(LDFLAGS.LIBS) $2
+ ln -fs $(notdir $@.$(SHARED.$3)) $@
endef
-
- # Linking rules ($1 = target full filename, $2 = dependency list,
---- lensfun-0.2.3/build/mak/compiler/gcc.mak~orig 2008-11-19 19:09:32.000000000 +0100
-+++ lensfun-0.2.3/build/mak/compiler/gcc.mak 2008-11-19 19:11:39.000000000 +0100
+ define LINK.GCC.SO.NOVER
+ $(GCC.LD) -o $@ $(call GCC.LDFLAGS.SHARED,$(notdir $@),$(dir $@)) $(GCC.LDFLAGS) $(LDFLAGS) $1 $^ $(GCC.LDFLAGS.LIBS) $(LDFLAGS.LIBS) $2
+--- lensfun-0.2.3/build/tibs/compiler/gcc.mak~orig 2008-11-19 19:09:32.000000000 +0100
++++ lensfun-0.2.3/build/tibs/compiler/gcc.mak 2008-11-19 19:11:39.000000000 +0100
@@ -93,7 +93,7 @@
# $3 = full target file name)
define MKIRULES.GCC
$(if $(findstring $L,$2),\
--$(foreach _,$3 $(if $(SHARED.$2),$3.$(SHARED.$2) $3.$(basename $(basename $(SHARED.$2)))),
-+$(foreach _,$3 $(if $(SHARED.$2),$3.$(SHARED.$2)),
- $(if $V,, at echo INSTALL $_ to $(call .INSTDIR,$1,$2,$(CONF_LIBDIR)) &&)\
- $$(call INSTALL,$_,$(call .INSTDIR,$1,$2,$(CONF_LIBDIR)),$(if $(SHARED.$2),0755,0644))))\
+-$(foreach _,$3 $(if $(call VALID_VERSION,$(SHARED.$2)),$3.$(basename $(basename $(SHARED.$2))) $3.$(SHARED.$2)),
++$(foreach _,$3 $(if $(call VALID_VERSION,$(SHARED.$2)),$3.$(SHARED.$2)),
+ $(if $V,, at echo INSTALL $_ to $(call .INSTDIR,$1,$2,LIB,$(CONF_LIBDIR)) &&)\
+ $$(call INSTALL,$_,$(call .INSTDIR,$1,$2,LIB,$(CONF_LIBDIR)),$(call .INSTMODE,$1,$2,$(if $(SHARED.$2),0755,0644)))))\
$(if $(findstring $E,$2),
================================================================
Index: packages/lensfun/lensfun.spec
diff -u packages/lensfun/lensfun.spec:1.3 packages/lensfun/lensfun.spec:1.4
--- packages/lensfun/lensfun.spec:1.3 Mon Nov 24 19:46:52 2008
+++ packages/lensfun/lensfun.spec Mon Jun 28 01:24:49 2010
@@ -1,14 +1,17 @@
# $Revision$, $Date$
#
+# TODO:
+# - install manuals and
+#
Summary: Camera lens database with image correction support
Summary(pl.UTF-8): Baza danych obiektywów z funkcją korekcji zdjęć
Name: lensfun
-Version: 0.2.3
-Release: 1
-License: LGPL
+Version: 0.2.5
+Release: 0.1
+License: LGPLv3 and CC-BY-SA
Group: Libraries
Source0: http://download.berlios.de/lensfun/%{name}-%{version}.tar.bz2
-# Source0-md5: c5c04be4f53e3eef450ff4948d8f65b3
+# Source0-md5: a10438dffae68a5988fc54b0393a3755
URL: http://developer.berlios.de/projects/lensfun/
Patch0: %{name}-build.patch
BuildRequires: doxygen >= 1.5.0
@@ -77,7 +80,7 @@
--compiler="gcc"
# 'all' is not the default target
-%{__make} all
+%{__make} all V=1
%install
rm -rf $RPM_BUILD_ROOT
@@ -93,7 +96,7 @@
%files
%defattr(644,root,root,755)
-%doc README
+%doc README docs/cc-by-sa-3.0.txt
%attr(755,root,root) %{_libdir}/liblensfun.so.*.*.*
%{_datadir}/lensfun
@@ -112,6 +115,11 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.4 2010/06/27 23:24:49 draenog
+- up to 0.2.5
+- correct license
+- add TODO
+
Revision 1.3 2008/11/24 18:46:52 paszczus
- rel 1
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/lensfun/lensfun-build.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/lensfun/lensfun.spec?r1=1.3&r2=1.4&f=u
More information about the pld-cvs-commit
mailing list