[packages/camorama] Rel 3

arekm arekm at pld-linux.org
Wed May 20 18:43:38 CEST 2026


commit 235bdf27e6e26a5124f5fa3d16afafe9f97b711d
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Wed May 20 18:43:22 2026 +0200

    Rel 3

 camorama-fno-common.patch | 35 +++++++++++++++++++++++++++++++++++
 camorama.spec             | 10 +++-------
 2 files changed, 38 insertions(+), 7 deletions(-)
---
diff --git a/camorama.spec b/camorama.spec
index fd0b98e..305a8a3 100644
--- a/camorama.spec
+++ b/camorama.spec
@@ -2,7 +2,7 @@ Summary:	GNOME webcam program
 Summary(pl.UTF-8):	Program do kamer internetowych dla GNOME
 Name:		camorama
 Version:	0.20.7
-Release:	2
+Release:	3
 License:	GPL v2+
 Group:		X11/Applications/Multimedia
 # up to 0.19
@@ -11,9 +11,8 @@ Group:		X11/Applications/Multimedia
 Source0:	https://linuxtv.org/downloads/camorama/%{name}-%{version}.tar.gz
 # Source0-md5:	98c09616c3fd23821a2644f665620fda
 Patch0:		%{name}-desktop.patch
+Patch1:		%{name}-fno-common.patch
 URL:		http://camorama.fixedgear.org/
-BuildRequires:	autoconf >= 2.53
-BuildRequires:	automake
 BuildRequires:	gdk-pixbuf2-devel >= 2.0
 BuildRequires:	gettext-tools >= 0.19.8
 # also possible: gtk+2 >= 2:2.24, gtk+4 >= 3.92
@@ -36,12 +35,9 @@ dodawania niektórych efektów graficznych.
 %prep
 %setup -q
 %patch -P0 -p1
+%patch -P1 -p1
 
 %build
-%{__aclocal}
-%{__autoconf}
-%{__autoheader}
-%{__automake}
 %configure
 
 %{__make}
diff --git a/camorama-fno-common.patch b/camorama-fno-common.patch
new file mode 100644
index 0000000..2405460
--- /dev/null
+++ b/camorama-fno-common.patch
@@ -0,0 +1,35 @@
+Move tentative global definitions to extern declarations to fix multiple
+definition errors with GCC 10+ (-fno-common default). Provide the actual
+storage in main.c.
+
+--- camorama-0.20.7/src/camorama-globals.h.orig
++++ camorama-0.20.7/src/camorama-globals.h
+@@ -29,10 +29,10 @@
+
+ G_BEGIN_DECLS
+
+-GtkWidget *prefswindow;
+-int frames, frames2, seconds;
+-GtkWidget *dentry, *entry2, *string_entry, *format_selection;
+-GtkWidget *host_entry, *protocol, *rdir_entry, *filename_entry;
++extern GtkWidget *prefswindow;
++extern int frames, frames2, seconds;
++extern GtkWidget *dentry, *entry2, *string_entry, *format_selection;
++extern GtkWidget *host_entry, *protocol, *rdir_entry, *filename_entry;
+
+ G_END_DECLS
+ #endif                          /* !CAMORAMA_GLOBALS_H */
+--- camorama-0.20.7/src/main.c.orig
++++ camorama-0.20.7/src/main.c
+@@ -13,6 +13,11 @@
+ #include <libv4l2.h>
+ #include <stdlib.h>
+
++GtkWidget *prefswindow;
++int frames, frames2, seconds;
++GtkWidget *dentry, *entry2, *string_entry, *format_selection;
++GtkWidget *host_entry, *protocol, *rdir_entry, *filename_entry;
++
+ static int ver = 0, max = 0, min;
+ static int half = 0, use_read = 0, debug = 0;
+ static gchar *video_dev = NULL;
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/camorama.git/commitdiff/235bdf27e6e26a5124f5fa3d16afafe9f97b711d



More information about the pld-cvs-commit mailing list