Author: draenog Date: Tue Sep 9 20:18:59 2008 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- hugin uses cmake now
---- Files affected:
SOURCES:
hugin-asneeded.patch (1.2 -> 1.3)
---- Diffs:
================================================================
Index: SOURCES/hugin-asneeded.patch
diff -u SOURCES/hugin-asneeded.patch:1.2 SOURCES/hugin-asneeded.patch:1.3
--- SOURCES/hugin-asneeded.patch:1.2 Sun Mar 11 23:07:44 2007
+++ SOURCES/hugin-asneeded.patch Tue Sep 9 22:18:53 2008
@@ -1,30 +1,20 @@
---- hugin-0.6/src/nona_gui/Makefile.am.orig 2006-07-23 11:50:10.000000000
+0200
-+++ hugin-0.6/src/nona_gui/Makefile.am 2006-08-19 22:22:16.302037250 +0200
-@@ -2,7 +2,6 @@
- DEFAULT_INCLUDES="-I."
- INCLUDES = -I$(top_builddir)/src/include -I${top_srcdir}/src/include
-I${top_srcdir}/src/foreign $(WX_CXXFLAGS)
- AM_CXXFLAGS = $(JPEG_FLAGS) $(PNG_FLAGS) $(TIFF_FLAGS) $(ZLIB_FLAGS)
$(PANO_FLAGS) $(BOOST_CPPFLAGS) -DINSTALL_XRC_DIR=\"$(datadir)/hugin/xrc\"
-DINSTALL_LOCALE_DIR=\"${datadir}/locale\"
--AM_LDFLAGS = $(WX_LIBS) $(LIB_JPEG) $(LIB_PNG) $(LIB_TIFF) $(LIB_ZLIB)
$(LIB_PANO) $(BOOST_THREAD_LIB)
-
- SUFFIXES = .rc
-
-@@ -29,7 +28,8 @@
- ${top_builddir}/src/jhead/libjhead.la \
- ${top_builddir}/src/foreign/vigra_impex/libvigra_impex.la \
- ${top_builddir}/src/hugin/libhuginwxutils.la \
-- ${top_builddir}/src/vigra_ext/libvigra_ext.la
-+ ${top_builddir}/src/vigra_ext/libvigra_ext.la \
-+ $(WX_LIBS) $(LIB_JPEG) $(LIB_PNG) $(LIB_TIFF) $(LIB_ZLIB)
$(LIB_PANO) $(BOOST_THREAD_LIB)
-
- EXTRA_DIST = nona_gui_rc.rc nona_gui.vcproj
-
---- hugin-0.7_beta4/src/Panorama/Makefile.am.orig 2007-03-11
21:41:11.000000000 +0000
-+++ hugin-0.7_beta4/src/Panorama/Makefile.am 2007-03-11 21:43:21.000000000
+0000
-@@ -6,6 +6,7 @@
-
- noinst_LTLIBRARIES = libpanorama.la
- libpanorama_la_SOURCES = Panorama.cpp PanoramaMemento.cpp PanoImage.cpp
PanoToolsInterface.cpp SpaceTransform.cpp PTOptimise.cpp ImageGraph.cpp
Stitcher.cpp Stitcher1.cpp Stitcher2.cpp Stitcher3.cpp Stitcher4.cpp utils.cpp
-+libpanorama_la_LIBADD = $(BOOST_THREAD_LIB)
-
- EXTRA_DIST=Panorama.vcproj OptimizeOptions.cpp
- noinst_HEADERS =
+--- hugin-0.7.0/src/hugin_base/CMakeLists.txt~ 2008-09-03 21:59:25.000000000
+0100
++++ hugin-0.7.0/src/hugin_base/CMakeLists.txt 2008-09-09 18:56:04.000000000
+0100
+@@ -58,6 +58,7 @@
+ IF (${HUGIN_SHARED_LIBS})
+ add_library(huginbase SHARED ${HUGIN_BASE_SRC})
+ set_target_properties(huginbase PROPERTIES VERSION ${HUGIN_LIB_VERSION})
++ target_link_libraries(huginbase huginvigraimpex ${PANO_LIBRARIES}
${Boost_thread_LIBRARIES} ${EXIV2_LIBRARIES})
+ install(TARGETS huginbase DESTINATION ${LIBDIR})
+ ELSE (${HUGIN_SHARED_LIBS})
+ add_library(huginbase STATIC ${HUGIN_BASE_SRC})
+--- hugin-0.7.0/src/foreign/vigra/vigra_impex/CMakeLists.txt~ 2008-09-03
21:59:24.000000000 +0100
++++ hugin-0.7.0/src/foreign/vigra/vigra_impex/CMakeLists.txt 2008-09-09
18:56:31.000000000 +0100
+@@ -5,6 +5,7 @@
+ IF (${HUGIN_SHARED_LIBS})
+ add_library(huginvigraimpex SHARED ${VIGRA_IMPEX_SRC})
+ set_target_properties(huginvigraimpex PROPERTIES VERSION
${HUGIN_LIB_VERSION})
++ target_link_libraries(huginvigraimpex ${OPENEXR_LIBRARIES}
${JPEG_LIBRARIES} ${PNG_LIBRARIES} ${TIFF_LIBRARIES})
+ install(TARGETS huginvigraimpex DESTINATION ${LIBDIR})
+ ELSE (${HUGIN_SHARED_LIBS})
+ add_library(huginvigraimpex STATIC ${VIGRA_IMPEX_SRC})
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/hugin-asneeded.patch?r1=1.2&r2=1.3&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
