[SCM] ll-scope/master: Add two patches.

alessio at users.alioth.debian.org alessio at users.alioth.debian.org
Thu Mar 24 13:19:27 UTC 2011


The following commit has been merged in the master branch:
commit 6dd96895736f89205edf396e899b984732d5ed2d
Author: Alessio Treglia <alessio at debian.org>
Date:   Thu Mar 24 14:17:19 2011 +0100

    Add two patches.
    
    debian/patches/compiler_warnings.patch:
     - Fix a missing-header-warning.
     - Remove a unused static variable.
    debian/patches/linking_order.patch:
     - Fix linking order to properly set LDFLAGS.

diff --git a/debian/patches/compiler_warnings.patch b/debian/patches/compiler_warnings.patch
new file mode 100644
index 0000000..148f641
--- /dev/null
+++ b/debian/patches/compiler_warnings.patch
@@ -0,0 +1,41 @@
+Description: Fix some compiler warnings.
+Author: Alessio Treglia <alessio at debian.org>
+Forwarded: no
+---
+ ringbuffer.c |    4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+--- ll-scope.orig/ringbuffer.c
++++ ll-scope/ringbuffer.c
+@@ -22,6 +22,7 @@
+ 
+ /* #include <stdio.h> */
+ 
++#include <string.h>
+ #include "ringbuffer.h"
+ 
+ 
+@@ -36,7 +37,6 @@ void ringbuf_init(ringbuf_t* rb, int ato
+ int ringbuf_read(ringbuf_t* rb, void* dest, int size) {
+   
+   int n = 0;
+-  static int col = 0;
+   
+   if (size == 0)
+     return 0;
+@@ -73,7 +73,6 @@ int ringbuf_read(ringbuf_t* rb, void* de
+ 
+ int ringbuf_write(ringbuf_t* rb, void* src, int size) {
+   int n = 0;
+-  static int col = 0;
+ 
+   if (size == 0)
+     return 0;
+@@ -108,7 +107,6 @@ int ringbuf_write(ringbuf_t* rb, void* s
+ 
+ int ringbuf_write_zeros(ringbuf_t* rb, int size) {
+   int n = 0;
+-  static int col = 0;
+ 
+   if (size == 0)
+     return 0;
diff --git a/debian/patches/linking_order.patch b/debian/patches/linking_order.patch
new file mode 100644
index 0000000..563e248
--- /dev/null
+++ b/debian/patches/linking_order.patch
@@ -0,0 +1,18 @@
+Description: Improve linking order and set LDFLAGS.
+Author: Alessio Treglia <alessio at debian.org>
+Forwarded: no
+---
+ Makefile |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- ll-scope.orig/Makefile
++++ ll-scope/Makefile
+@@ -8,7 +8,7 @@ all:	ll-scope.so ll-scope_gtk
+ 	$(LD) `pkg-config dssi --libs` -o $*.so $*.o dssi_shm.o ringbuffer.o -shared
+ 
+ ll-scope_gtk:	main.cpp scopewidget.hpp scopewidget.cpp dssiuiclient.hpp dssiuiclient.cpp dssi_shm.o ringbuffer.o ll-scope.h Makefile
+-	$(CXX) $(CXXFLAGS) $(CFLAGS) -D_SVID_SOURCE -D_XOPEN_SOURCE -DINSTALL_DIR=\"$(INSTALL_DIR)\" `pkg-config libglademm-2.4 gthread-2.0 liblo dssi --cflags --libs` main.cpp scopewidget.cpp dssiuiclient.cpp dssi_shm.o ringbuffer.o -o ll-scope_gtk -g
++	$(CXX) $(LDFLAGS) $(CXXFLAGS) $(CFLAGS) -g -D_SVID_SOURCE -D_XOPEN_SOURCE -DINSTALL_DIR=\"$(INSTALL_DIR)\" `pkg-config libglademm-2.4 gthread-2.0 liblo dssi --cflags` main.cpp scopewidget.cpp dssiuiclient.cpp dssi_shm.o ringbuffer.o `pkg-config libglademm-2.4 gthread-2.0 liblo dssi --libs` -o ll-scope_gtk
+ 
+ %.o: %.h %.c
+ 	$(CC) $(CFLAGS) -D_SVID_SOURCE -D_XOPEN_SOURCE -DINSTALL_DIR=\"$(INSTALL_DIR)\" `pkg-config dssi --cflags` -c $*.c -g 
diff --git a/debian/patches/series b/debian/patches/series
index f6aa0be..298b7cd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,4 @@
 destdir.patch
 sigcnamespace.patch
+compiler_warnings.patch
+linking_order.patch

-- 
ll-scope packaging



More information about the pkg-multimedia-commits mailing list