[SCM] camorama/master: Convert patches to quilt format.
alessio at users.alioth.debian.org
alessio at users.alioth.debian.org
Mon Jul 21 15:24:36 UTC 2014
The following commit has been merged in the master branch:
commit a208066b86e9c22160179586851672fb5991cf18
Author: Alessio Treglia <alessio at debian.org>
Date: Mon Jul 21 15:43:58 2014 +0100
Convert patches to quilt format.
diff --git a/debian/patches/665516-glib-headers.patch b/debian/patches/665516-glib-headers.patch
index 8ed3b6e..c8a2b43 100644
--- a/debian/patches/665516-glib-headers.patch
+++ b/debian/patches/665516-glib-headers.patch
@@ -3,8 +3,13 @@ Origin: vendor
Bug-Debian: http://bugs.debian.org/665516
Subject: Including individual glib headers no longer supported
---- camorama-0.19.orig/src/camorama-stock-items.h
-+++ camorama-0.19/src/camorama-stock-items.h
+---
+ src/camorama-stock-items.h | 2 +-
+ src/glib-helpers.h | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+--- camorama.orig/src/camorama-stock-items.h
++++ camorama/src/camorama-stock-items.h
@@ -1,7 +1,7 @@
#ifndef CAMORAMA_STOCK_ITEMS_H
#define CAMORAMA_STOCK_ITEMS_H
@@ -14,8 +19,8 @@ Subject: Including individual glib headers no longer supported
G_BEGIN_DECLS
---- camorama-0.19.orig/src/glib-helpers.h
-+++ camorama-0.19/src/glib-helpers.h
+--- camorama.orig/src/glib-helpers.h
++++ camorama/src/glib-helpers.h
@@ -24,7 +24,7 @@
#ifndef GLIB_HELPERS_H
#define GLIB_HELPERS_H
diff --git a/debian/patches/S50_0.18_missing_prototype.patch b/debian/patches/S50_0.18_missing_prototype.patch
index 89ccb0b..46dc824 100644
--- a/debian/patches/S50_0.18_missing_prototype.patch
+++ b/debian/patches/S50_0.18_missing_prototype.patch
@@ -1,5 +1,9 @@
---- camorama-0.18/src/camorama-window.c.orig 2007-05-17 11:01:43.000000000 -0600
-+++ camorama-0.18/src/camorama-window.c 2007-05-17 11:01:56.000000000 -0600
+---
+ src/camorama-window.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+--- camorama.orig/src/camorama-window.c
++++ camorama/src/camorama-window.c
@@ -36,6 +36,7 @@
#include "camorama-stock-items.h"
#include "filter.h"
@@ -7,4 +11,4 @@
+#include "support.h"
static GQuark menu_item_filter_type = 0;
-
+
diff --git a/debian/patches/S50_0.19_deprecated_v4l1.patch b/debian/patches/S50_0.19_deprecated_v4l1.patch
index cbf0157..217f690 100644
--- a/debian/patches/S50_0.19_deprecated_v4l1.patch
+++ b/debian/patches/S50_0.19_deprecated_v4l1.patch
@@ -3,9 +3,12 @@ Description: V4L1 support was removed in the most recent kernels.
Origin: Ubuntu
Bug-Ubuntu: https://launchpad.net/bugs/749079
Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=621953
-diff -Nur -x '*.orig' -x '*~' camorama-0.19//src/v4l.h camorama-0.19.new//src/v4l.h
---- camorama-0.19//src/v4l.h 2007-09-16 15:36:55.000000000 +0200
-+++ camorama-0.19.new//src/v4l.h 2011-08-10 10:48:11.127104703 +0200
+---
+ src/v4l.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- camorama.orig/src/v4l.h
++++ camorama/src/v4l.h
@@ -13,7 +13,7 @@
#include <fcntl.h>
#include <gtk/gtk.h>
diff --git a/debian/patches/S50_0.19_desktop.patch b/debian/patches/S50_0.19_desktop.patch
index f5d98f5..03518c6 100644
--- a/debian/patches/S50_0.19_desktop.patch
+++ b/debian/patches/S50_0.19_desktop.patch
@@ -1,6 +1,10 @@
---- camorama-0.19/camorama.desktop.in 2007-06-14 16:05:33.000000000 +0200
-+++ camorama-0.19/camorama.desktop.in.costela 2007-11-24 00:47:48.000000000 +0100
-@@ -5,7 +5,7 @@
+---
+ camorama.desktop.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- camorama.orig/camorama.desktop.in
++++ camorama/camorama.desktop.in
+@@ -5,7 +5,7 @@ Exec=camorama
Terminal=0
Type=Application
Icon=camorama.png
diff --git a/debian/patches/S50_0.19_newv4l.patch b/debian/patches/S50_0.19_newv4l.patch
index f0cde68..58775f2 100644
--- a/debian/patches/S50_0.19_newv4l.patch
+++ b/debian/patches/S50_0.19_newv4l.patch
@@ -1,6 +1,15 @@
-diff -Nur -x '*.orig' -x '*~' camorama-0.19/src/callbacks.c camorama-0.19.new/src/callbacks.c
---- camorama-0.19/src/callbacks.c 2007-09-16 15:36:55.000000000 +0200
-+++ camorama-0.19.new/src/callbacks.c 2010-05-18 18:15:21.533068008 +0200
+---
+ src/Makefile.am | 2 +-
+ src/Makefile.in | 2 +-
+ src/callbacks.c | 31 ++++++++++++++++++++-----------
+ src/camorama-window.c | 6 +-----
+ src/filter.c | 4 ++--
+ src/main.c | 9 ++++++---
+ src/v4l.c | 19 +++++++++++--------
+ 7 files changed, 42 insertions(+), 31 deletions(-)
+
+--- camorama.orig/src/callbacks.c
++++ camorama/src/callbacks.c
@@ -9,6 +9,7 @@
#include <libgnomeui/gnome-propertybox.h>
#include <libgnomeui/gnome-window-icon.h>
@@ -9,7 +18,7 @@ diff -Nur -x '*.orig' -x '*~' camorama-0.19/src/callbacks.c camorama-0.19.new/sr
extern GtkWidget *main_window, *prefswindow;
//extern state func_state;
-@@ -387,13 +388,10 @@
+@@ -387,13 +388,10 @@ void on_change_size_activate (GtkWidget
}
}
@@ -24,7 +33,7 @@ diff -Nur -x '*.orig' -x '*~' camorama-0.19/src/callbacks.c camorama-0.19.new/sr
*
* if((unsigned char *) -1 == (unsigned char *) cam->pic) {
* if(cam->debug == TRUE) {
-@@ -404,7 +402,7 @@
+@@ -404,7 +402,7 @@ void on_change_size_activate (GtkWidget
* }
* }else{
* cam->pic_buf = malloc(cam->x * cam->y * cam->depth);
@@ -33,7 +42,7 @@ diff -Nur -x '*.orig' -x '*~' camorama-0.19/src/callbacks.c camorama-0.19.new/sr
* }
*/
-@@ -430,7 +428,7 @@
+@@ -430,7 +428,7 @@ void on_change_size_activate (GtkWidget
* if(cam->read == FALSE) {
* * for(frame = 0; frame < cam->vid_buf.frames; frame++) {
* * cam->vid_map.frame = frame;
@@ -42,7 +51,7 @@ diff -Nur -x '*.orig' -x '*~' camorama-0.19/src/callbacks.c camorama-0.19.new/sr
* * if(cam->debug == TRUE) {
* * fprintf(stderr, "Unable to capture image (VIDIOCMCAPTURE) during resize.\n");
* * }
-@@ -441,6 +439,11 @@
+@@ -441,6 +439,11 @@ void on_change_size_activate (GtkWidget
* * }
*/
get_win_info (cam);
@@ -54,7 +63,7 @@ diff -Nur -x '*.orig' -x '*~' camorama-0.19/src/callbacks.c camorama-0.19.new/sr
frame = 0;
gtk_window_resize (GTK_WINDOW
(glade_xml_get_widget (cam->xml, "main_window")), 320,
-@@ -520,8 +523,14 @@
+@@ -520,8 +523,14 @@ void on_about_activate (GtkMenuItem * me
gtk_widget_show (about);
}
@@ -69,7 +78,7 @@ diff -Nur -x '*.orig' -x '*~' camorama-0.19/src/callbacks.c camorama-0.19.new/sr
camorama_filter_chain_apply(cam->filter_chain, cam->pic_buf, cam->x, cam->y, cam->depth);
#warning "FIXME: enable the threshold channel filter"
// if((effect_mask & CAMORAMA_FILTER_THRESHOLD_CHANNEL) != 0)
-@@ -539,7 +548,7 @@
+@@ -539,7 +548,7 @@ read_timeout_func(cam* cam) {
int i, count = 0;
GdkGC *gc;
@@ -78,7 +87,7 @@ diff -Nur -x '*.orig' -x '*~' camorama-0.19/src/callbacks.c camorama-0.19.new/sr
frames2++;
/*
* update_rec.x = 0;
-@@ -580,7 +589,7 @@
+@@ -580,7 +589,7 @@ gint timeout_func (cam * cam)
i = -1;
while (i < 0) {
@@ -87,7 +96,7 @@ diff -Nur -x '*.orig' -x '*~' camorama-0.19/src/callbacks.c camorama-0.19.new/sr
if (i < 0 && errno == EINTR) {
if (cam->debug == TRUE) {
-@@ -622,7 +631,7 @@
+@@ -622,7 +631,7 @@ gint timeout_func (cam * cam)
0, cam->x, cam->y);
cam->vid_map.frame = frame;
@@ -96,7 +105,7 @@ diff -Nur -x '*.orig' -x '*~' camorama-0.19/src/callbacks.c camorama-0.19.new/sr
if (cam->debug == TRUE) {
fprintf (stderr, "Unable to capture image (VIDIOCMCAPTURE)\n");
}
-@@ -669,7 +678,7 @@
+@@ -669,7 +678,7 @@ void on_status_show (GtkWidget * sb, cam
void init_cam (GtkWidget * capture, cam * cam)
{
cam->pic =
@@ -105,7 +114,7 @@ diff -Nur -x '*.orig' -x '*~' camorama-0.19/src/callbacks.c camorama-0.19.new/sr
MAP_SHARED, cam->dev, 0);
if ((unsigned char *) -1 == (unsigned char *) cam->pic) {
-@@ -684,7 +693,7 @@
+@@ -684,7 +693,7 @@ void init_cam (GtkWidget * capture, cam
cam->vid_map.format = cam->vid_pic.palette;
for (frame = 0; frame < cam->vid_buf.frames; frame++) {
cam->vid_map.frame = frame;
@@ -114,10 +123,9 @@ diff -Nur -x '*.orig' -x '*~' camorama-0.19/src/callbacks.c camorama-0.19.new/sr
if (cam->debug == TRUE) {
fprintf (stderr,
"Unable to capture image (VIDIOCMCAPTURE).\n");
-diff -Nur -x '*.orig' -x '*~' camorama-0.19/src/camorama-window.c camorama-0.19.new/src/camorama-window.c
---- camorama-0.19/src/camorama-window.c 2010-05-18 18:15:20.893067745 +0200
-+++ camorama-0.19.new/src/camorama-window.c 2010-05-18 18:15:21.533068008 +0200
-@@ -210,11 +210,7 @@
+--- camorama.orig/src/camorama-window.c
++++ camorama/src/camorama-window.c
+@@ -210,11 +210,7 @@ load_interface(cam* cam) {
logo = gtk_icon_theme_load_icon(gtk_icon_theme_get_for_screen(gtk_widget_get_screen(glade_xml_get_widget(cam->xml, "main_window"))), CAMORAMA_STOCK_WEBCAM, 24, 0, NULL);
gtk_window_set_default_icon(logo);
@@ -130,10 +138,9 @@ diff -Nur -x '*.orig' -x '*~' camorama-0.19/src/camorama-window.c camorama-0.19.
if (cam->show_adjustments == FALSE) {
gtk_widget_hide (glade_xml_get_widget
(cam->xml, "adjustments_table"));
-diff -Nur -x '*.orig' -x '*~' camorama-0.19/src/filter.c camorama-0.19.new/src/filter.c
---- camorama-0.19/src/filter.c 2007-09-16 14:48:50.000000000 +0200
-+++ camorama-0.19.new/src/filter.c 2010-05-18 18:15:21.533068008 +0200
-@@ -151,12 +151,12 @@
+--- camorama.orig/src/filter.c
++++ camorama/src/filter.c
+@@ -151,12 +151,12 @@ G_DEFINE_TYPE(CamoramaFilterColor, camor
static void
camorama_filter_color_init(CamoramaFilterColor* self) {}
@@ -148,9 +155,8 @@ diff -Nur -x '*.orig' -x '*~' camorama-0.19/src/filter.c camorama-0.19.new/src/f
tmp = image[0];
image[0] = image[2];
image[2] = tmp;
-diff -Nur -x '*.orig' -x '*~' camorama-0.19/src/main.c camorama-0.19.new/src/main.c
---- camorama-0.19/src/main.c 2007-09-16 15:36:55.000000000 +0200
-+++ camorama-0.19.new/src/main.c 2010-05-18 18:15:21.533068008 +0200
+--- camorama.orig/src/main.c
++++ camorama/src/main.c
@@ -9,6 +9,7 @@
#include <gdk-pixbuf-xlib/gdk-pixbuf-xlib.h>
#include <gdk-pixbuf-xlib/gdk-pixbuf-xlibrgb.h>
@@ -159,7 +165,7 @@ diff -Nur -x '*.orig' -x '*~' camorama-0.19/src/main.c camorama-0.19.new/src/mai
#include "camorama-display.h"
#include "camorama-stock-items.h"
-@@ -206,7 +207,7 @@
+@@ -206,7 +207,7 @@ main(int argc, char *argv[]) {
gdk_pixbuf_xlib_init (display, 0);
cam->desk_depth = xlib_rgb_get_depth ();
@@ -168,7 +174,7 @@ diff -Nur -x '*.orig' -x '*~' camorama-0.19/src/main.c camorama-0.19.new/src/mai
camera_cap (cam);
get_win_info (cam);
-@@ -224,8 +225,7 @@
+@@ -224,8 +225,7 @@ main(int argc, char *argv[]) {
/* get picture attributes */
get_pic_info (cam);
@@ -178,19 +184,18 @@ diff -Nur -x '*.orig' -x '*~' camorama-0.19/src/main.c camorama-0.19.new/src/mai
cam->contrast = cam->vid_pic.contrast;
cam->brightness = cam->vid_pic.brightness;
cam->colour = cam->vid_pic.colour;
-@@ -285,5 +285,8 @@
+@@ -285,5 +285,8 @@ main(int argc, char *argv[]) {
gtk_timeout_add (2000, (GSourceFunc) fps, cam->status);
gtk_main ();
+ v4l1_munmap(cam->pic, cam->vid_buf.size);
+ v4l1_close(cam->dev);
-+
++
return 0;
}
-diff -Nur -x '*.orig' -x '*~' camorama-0.19/src/Makefile.am camorama-0.19.new/src/Makefile.am
---- camorama-0.19/src/Makefile.am 2007-09-16 14:48:05.000000000 +0200
-+++ camorama-0.19.new/src/Makefile.am 2010-05-18 18:15:21.533068008 +0200
-@@ -36,7 +36,7 @@
+--- camorama.orig/src/Makefile.am
++++ camorama/src/Makefile.am
+@@ -36,7 +36,7 @@ camorama_SOURCES = \
filter.h \
$(BUILT_SOURCES)\
$(NULL)
@@ -199,10 +204,9 @@ diff -Nur -x '*.orig' -x '*~' camorama-0.19/src/Makefile.am camorama-0.19.new/sr
DISTCLEANFILES=$(BUILT_SOURCES)
-diff -Nur -x '*.orig' -x '*~' camorama-0.19/src/Makefile.in camorama-0.19.new/src/Makefile.in
---- camorama-0.19/src/Makefile.in 2007-10-06 21:06:28.000000000 +0200
-+++ camorama-0.19.new/src/Makefile.in 2010-05-18 18:15:21.533068008 +0200
-@@ -248,7 +248,7 @@
+--- camorama.orig/src/Makefile.in
++++ camorama/src/Makefile.in
+@@ -248,7 +248,7 @@ camorama_SOURCES = \
$(BUILT_SOURCES)\
$(NULL)
@@ -211,9 +215,8 @@ diff -Nur -x '*.orig' -x '*~' camorama-0.19/src/Makefile.in camorama-0.19.new/sr
DISTCLEANFILES = $(BUILT_SOURCES)
all: $(BUILT_SOURCES)
$(MAKE) $(AM_MAKEFLAGS) all-am
-diff -Nur -x '*.orig' -x '*~' camorama-0.19/src/v4l.c camorama-0.19.new/src/v4l.c
---- camorama-0.19/src/v4l.c 2007-09-16 14:48:05.000000000 +0200
-+++ camorama-0.19.new/src/v4l.c 2010-05-18 18:15:21.533068008 +0200
+--- camorama.orig/src/v4l.c
++++ camorama/src/v4l.c
@@ -2,6 +2,7 @@
#include<time.h>
#include<errno.h>
@@ -222,7 +225,7 @@ diff -Nur -x '*.orig' -x '*~' camorama-0.19/src/v4l.c camorama-0.19.new/src/v4l.
#include "support.h"
extern int frame_number;
-@@ -87,7 +88,7 @@
+@@ -87,7 +88,7 @@ void print_palette(int p)
void camera_cap(cam * cam)
{
char *msg;
@@ -231,7 +234,7 @@ diff -Nur -x '*.orig' -x '*~' camorama-0.19/src/v4l.c camorama-0.19.new/src/v4l.
if(cam->debug == TRUE) {
fprintf(stderr, "VIDIOCGCAP -- could not get camera capabilities, exiting.....\n");
}
-@@ -158,10 +159,10 @@
+@@ -158,10 +159,10 @@ set_pic_info(cam* cam) {
if(cam->debug) {
g_message("SET PIC");
}
@@ -245,7 +248,7 @@ diff -Nur -x '*.orig' -x '*~' camorama-0.19/src/v4l.c camorama-0.19.new/src/v4l.
if(cam->debug) {
g_message("VIDIOCSPICT -- could not set picture info, exiting....");
}
-@@ -176,7 +177,7 @@
+@@ -176,7 +177,7 @@ void get_pic_info(cam * cam){
//set_pic_info(cam);
char *msg;
@@ -254,7 +257,7 @@ diff -Nur -x '*.orig' -x '*~' camorama-0.19/src/v4l.c camorama-0.19.new/src/v4l.
msg = g_strdup_printf(_("Could not connect to video device (%s).\nPlease check connection."), cam->video_dev);
error_dialog(msg);
if(cam->debug == TRUE) {
-@@ -201,7 +202,7 @@
+@@ -201,7 +202,7 @@ void get_pic_info(cam * cam){
void get_win_info(cam * cam)
{
gchar *msg;
@@ -263,7 +266,7 @@ diff -Nur -x '*.orig' -x '*~' camorama-0.19/src/v4l.c camorama-0.19.new/src/v4l.
msg = g_strdup_printf(_("Could not connect to video device (%s).\nPlease check connection."), cam->video_dev);
error_dialog(msg);
if(cam->debug == TRUE) {
-@@ -222,7 +223,7 @@
+@@ -222,7 +223,7 @@ void get_win_info(cam * cam)
void set_win_info(cam * cam)
{
gchar *msg;
@@ -272,7 +275,7 @@ diff -Nur -x '*.orig' -x '*~' camorama-0.19/src/v4l.c camorama-0.19.new/src/v4l.
msg = g_strdup_printf(_("Could not connect to video device (%s).\nPlease check connection."), cam->video_dev);
error_dialog(msg);
if(cam->debug == TRUE) {
-@@ -232,12 +233,14 @@
+@@ -232,12 +233,14 @@ void set_win_info(cam * cam)
exit(0);
}
diff --git a/debian/patches/S50_0.19_versionfix.patch b/debian/patches/S50_0.19_versionfix.patch
index cf0e5e5..0f8c581 100644
--- a/debian/patches/S50_0.19_versionfix.patch
+++ b/debian/patches/S50_0.19_versionfix.patch
@@ -1,8 +1,11 @@
-diff -Nur camorama-0.19/src/main.c camorama-0.19.new/src/main.c
---- camorama-0.19/src/main.c 2007-07-20 13:13:51.000000000 +0200
-+++ camorama-0.19.new/src/main.c 2007-07-20 13:14:44.000000000 +0200
-@@ -101,7 +101,7 @@
- glade_gnome_init ();
+---
+ src/main.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- camorama.orig/src/main.c
++++ camorama/src/main.c
+@@ -128,7 +128,7 @@ main(int argc, char *argv[]) {
+
if (ver) {
- fprintf (stderr, _("\n\nCamorama version %s\n\n"), VERSION);
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..99a7769
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,6 @@
+665516-glib-headers.patch
+S50_0.18_missing_prototype.patch
+S50_0.19_deprecated_v4l1.patch
+S50_0.19_desktop.patch
+S50_0.19_newv4l.patch
+S50_0.19_versionfix.patch
--
camorama packaging
More information about the pkg-multimedia-commits
mailing list