commit 8fa2d6d3d917decb6417529684429549ae4a3240
Author: Jakub Bogusz <[email protected]>
Date: Tue Aug 27 15:55:04 2013 +0200
- updated to 1.9.3
- updated link patch
- removed obsolete fixes,netpbm patches
camwire-fixes.patch | 72 ----------------------------------------------------
camwire-link.patch | 3 ++-
camwire-netpbm.patch | 11 --------
camwire.spec | 14 +++++-----
4 files changed, 8 insertions(+), 92 deletions(-)
---
diff --git a/camwire.spec b/camwire.spec
index 36fcda2..920bfe7 100644
--- a/camwire.spec
+++ b/camwire.spec
@@ -1,17 +1,15 @@
Summary: Digital camera library for Linux
Summary(pl.UTF-8): Biblioteka obsługi kamer cyfrowych dla Linuksa
Name: camwire
-Version: 1.9.0
+Version: 1.9.3
Release: 1
License: LGPL v2.1+
Group: Libraries
# camwire1 was for libdc1394 < 2.0, camwire2 for libdc1394 2.0+
Source0:
http://kauri.auck.irl.cri.nz/~johanns/camwire/download/camwire2/camwire2-%{version}-Source.tar.gz
-# Source0-md5: 94edddf9f4b7efb00a695ed4fbd22f9f
-Patch0: %{name}-fixes.patch
-Patch1: %{name}-netpbm.patch
-Patch2: %{name}-link.patch
-Patch3: %{name}-etc.patch
+# Source0-md5: 1a49e2d9a751f3567e4b05a756be3b54
+Patch0: %{name}-link.patch
+Patch1: %{name}-etc.patch
URL: http://kauri.auck.irl.cri.nz/~johanns/camwire/
BuildRequires: SDL-devel
BuildRequires: cmake >= 2.6
@@ -75,10 +73,10 @@ Camwire.
%setup -q -n camwire2-%{version}-Source
%patch0 -p1
%patch1 -p1
-%patch2 -p1
-%patch3 -p1
%build
+# disable unused-result warning, compilation failure with -Werror
+CFLAGS="%{rpmcflags} -Wno-unused-result"
%cmake
%{__make} -j1
diff --git a/camwire-fixes.patch b/camwire-fixes.patch
deleted file mode 100644
index 1463332..0000000
--- a/camwire-fixes.patch
+++ /dev/null
@@ -1,72 +0,0 @@
---- camwire2-1.9.0-Source/camwire/camwire.c.orig 2011-02-17
03:31:12.000000000 +0100
-+++ camwire2-1.9.0-Source/camwire/camwire.c 2011-08-06 18:12:59.946406902
+0200
-@@ -3633,7 +3633,7 @@
- &capability));
- if (feature_is_usable(&capability))
- {
-- if (capability.trigger_polarity == DC1394_TRUE)
-+ if (capability.trigger_polarity == DC1394_TRIGGER_ACTIVE_HIGH)
- set->trigger_polarity = 1;
- else
- set->trigger_polarity = 0;
-@@ -3980,7 +3980,6 @@
- dc1394video_mode_t video_mode;
- dc1394framerate_t frame_rate_index;
- uint32_t num_packets, packet_size;
-- char *dma_device_file;
- int depth;
- dc1394framerates_t framerate_list;
- dc1394color_coding_t color_id;
-@@ -3993,15 +3992,6 @@
- internal_status = camwire_bus_get_userdata(c_handle);
- ERROR_IF_NULL(internal_status);
-
-- if (cfg->dma_device_name[0] == '\0')
-- {
-- dma_device_file = 0;
-- }
-- else
-- {
-- dma_device_file = cfg->dma_device_name;
-- }
--
- /* If dc1394_capture_stop() is called without a preceding
- successful call to dc1394_capture_setup(), libdc1394 used to get
- into a tangled state. That is why we keep track with the
---- camwire2-1.9.0-Source/examples/measureconf_1394.c.orig 2011-02-17
03:31:13.000000000 +0100
-+++ camwire2-1.9.0-Source/examples/measureconf_1394.c 2011-08-06
18:20:13.159740017 +0200
-@@ -621,7 +621,6 @@
- static int setup_trigger(const Camwire_handle c_handle, const int serial_dev)
- {
- int result, ext_trig;
-- double trig_time;
- void *buffer;
-
- single_shot_capable = 1; /* True unless we find out otherwise.*/
-@@ -633,7 +632,7 @@
- {
- camwire_set_trigger_polarity(c_handle, 1);
- camwire_set_run_stop(c_handle, 1); /* Camera waits for a trigger.*/
-- trig_time = trigger(c_handle, serial_dev);
-+ trigger(c_handle, serial_dev);
- complete_acquisition(c_handle); /* Make sure it's arrived.*/
- result = camwire_point_next_frame_poll(c_handle, &buffer, 0);
- if (result != CAMWIRE_SUCCESS)
-@@ -979,7 +978,7 @@
- const int serial_dev)
- {
- dc1394video_mode_t video_mode;
-- double framerate, shutter;
-+ double framerate;
- double f_dummy;
- double T, trig_time, timestamp;
- double transmit_time_in_ts_calc;
-@@ -1024,7 +1023,7 @@
- /* nanosleep(&nap, 0); */
-
- /* Trigger: */
-- shutter = set_random_shutter(c_handle);
-+ set_random_shutter(c_handle);
- if (ext_trig_OK) trig_time = trigger(c_handle, serial_dev);
- else trig_time = soft_trigger(c_handle);
- /* fprintf(stderr, "."); // Debugging. */
diff --git a/camwire-link.patch b/camwire-link.patch
index 553963f..1069a82 100644
--- a/camwire-link.patch
+++ b/camwire-link.patch
@@ -10,12 +10,13 @@
install (TARGETS camwire camwire_static DESTINATION lib)
--- camwire2-1.9.0-Source/examples/cammonitor/CMakeLists.txt.orig
2011-02-17 03:31:14.000000000 +0100
+++ camwire2-1.9.0-Source/examples/cammonitor/CMakeLists.txt 2011-08-07
07:21:57.196383177 +0200
-@@ -15,7 +15,7 @@ set_target_properties (cammonitor PROPER
+@@ -15,7 +15,8 @@ set_target_properties (cammonitor PROPER
LINK_FLAGS ${Camwire_SDL_LIBS}
SKIP_BUILD_RPATH ON)
target_link_libraries (cammonitor
- libcamwire.a
+ camwire
++ SDL
dc1394
netpbm
m
diff --git a/camwire-netpbm.patch b/camwire-netpbm.patch
deleted file mode 100644
index 2ca62cf..0000000
--- a/camwire-netpbm.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- camwire2-1.9.0-Source/examples/cammonitor/cammonitor.c.orig
2011-02-17 03:31:13.000000000 +0100
-+++ camwire2-1.9.0-Source/examples/cammonitor/cammonitor.c 2011-08-06
18:23:37.156406582 +0200
-@@ -41,7 +41,7 @@
- #include <ctype.h>
- #include <math.h>
- #include <sys/time.h>
--#include <netpbm/pam.h>
-+#include <pam.h>
- #include <inttypes.h>
-
- #include "camwire/camwirebus.h"
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/camwire.git/commitdiff/8fa2d6d3d917decb6417529684429549ae4a3240
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
