r3133 - in vdr/vdr-plugin-xineliboutput/trunk/debian: . patches

Tobias Grimm tiber-guest at costa.debian.org
Sat Aug 12 11:46:02 UTC 2006 

Author: tiber-guest
Date: 2006-08-12 11:46:02 +0000 (Sat, 12 Aug 2006)
New Revision: 3133

Added:
   vdr/vdr-plugin-xineliboutput/trunk/debian/patches/
   vdr/vdr-plugin-xineliboutput/trunk/debian/patches/00list
   vdr/vdr-plugin-xineliboutput/trunk/debian/patches/01_clean.dpatch
   vdr/vdr-plugin-xineliboutput/trunk/debian/patches/02_mismatched-delete.dpatch
   vdr/vdr-plugin-xineliboutput/trunk/debian/patches/03_memleaks.dpatch
Modified:
   vdr/vdr-plugin-xineliboutput/trunk/debian/changelog
   vdr/vdr-plugin-xineliboutput/trunk/debian/rules
Log:
* Added 01_clean.dpatch
* Added 02_mismatched-delete.dpatch
* Added 03_memleaks.dpatch


Modified: vdr/vdr-plugin-xineliboutput/trunk/debian/changelog
===================================================================
--- vdr/vdr-plugin-xineliboutput/trunk/debian/changelog	2006-08-11 21:01:56 UTC (rev 3132)
+++ vdr/vdr-plugin-xineliboutput/trunk/debian/changelog	2006-08-12 11:46:02 UTC (rev 3133)
@@ -5,6 +5,9 @@
   * Now install to correct Xine plugin directory, independent of the Xine version
   * Renamed frontend packages to xineliboutput-fbfe and xineliboutput-sxfe
   * Renamed local X frontend to vdr-plugin-xineliboutput-sx
+  * Added 01_clean.dpatch
+  * Added 02_mismatched-delete.dpatch
+  * Added 03_memleaks.dpatch
 
  -- Tobias Grimm <tg at e-tobi.net>  Fri, 11 Aug 2006 18:46:24 +0200
 

Added: vdr/vdr-plugin-xineliboutput/trunk/debian/patches/00list
===================================================================
--- vdr/vdr-plugin-xineliboutput/trunk/debian/patches/00list	2006-08-11 21:01:56 UTC (rev 3132)
+++ vdr/vdr-plugin-xineliboutput/trunk/debian/patches/00list	2006-08-12 11:46:02 UTC (rev 3133)
@@ -0,0 +1,3 @@
+01_clean
+02_mismatched-delete
+03_memleaks

Added: vdr/vdr-plugin-xineliboutput/trunk/debian/patches/01_clean.dpatch
===================================================================
--- vdr/vdr-plugin-xineliboutput/trunk/debian/patches/01_clean.dpatch	2006-08-11 21:01:56 UTC (rev 3132)
+++ vdr/vdr-plugin-xineliboutput/trunk/debian/patches/01_clean.dpatch	2006-08-12 11:46:02 UTC (rev 3133)
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01_clean.dpatch by Tobias Grimm <tg at e-tobi.net>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Delete ALL *.so* -files in clean target.
+
+ at DPATCH@
+diff -urNad vdr-plugin-xineliboutput-0.99rc4+cvs20060811~/Makefile vdr-plugin-xineliboutput-0.99rc4+cvs20060811/Makefile
+--- vdr-plugin-xineliboutput-0.99rc4+cvs20060811~/Makefile	2006-08-11 18:42:58.000000000 +0200
++++ vdr-plugin-xineliboutput-0.99rc4+cvs20060811/Makefile	2006-08-11 23:03:20.000000000 +0200
+@@ -386,7 +386,7 @@
+ 
+ 
+ clean:
+-	@-rm -f $(DEPFILE) *.so *.o *.tgz core* *~ *.flc *.bak \
++	@-rm -f $(DEPFILE) *.so* *.o *.tgz core* *~ *.flc *.bak \
+ 		tools/*.o tools/*~ tools/*.flc xine/*.o xine/*~ \
+ 		xine/*.flc $(VDR_FBFE) $(VDR_SXFE) mpg2c black_720x576.c \
+ 		nosignal_720x576.c vdrlogo_720x576.c vdr-sxfe vdr-fbfe


Property changes on: vdr/vdr-plugin-xineliboutput/trunk/debian/patches/01_clean.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Added: vdr/vdr-plugin-xineliboutput/trunk/debian/patches/02_mismatched-delete.dpatch
===================================================================
--- vdr/vdr-plugin-xineliboutput/trunk/debian/patches/02_mismatched-delete.dpatch	2006-08-11 21:01:56 UTC (rev 3132)
+++ vdr/vdr-plugin-xineliboutput/trunk/debian/patches/02_mismatched-delete.dpatch	2006-08-12 11:46:02 UTC (rev 3133)
@@ -0,0 +1,47 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 02_mismatched-delete.dpatch by Tobias Grimm <tg at e-tobi.net>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fixes usage of delete, where delete[] should be used.
+
+ at DPATCH@
+diff -urNad vdr-plugin-xineliboutput-0.99rc4+cvs20060811~/frontend.c vdr-plugin-xineliboutput-0.99rc4+cvs20060811/frontend.c
+--- vdr-plugin-xineliboutput-0.99rc4+cvs20060811~/frontend.c	2006-07-26 02:55:08.000000000 +0200
++++ vdr-plugin-xineliboutput-0.99rc4+cvs20060811/frontend.c	2006-08-12 12:04:09.000000000 +0200
+@@ -409,7 +409,7 @@
+     Play_PES(seqend, 13);
+   }
+ 
+-  delete frame;
++  delete[] frame;
+   return true;
+ }
+ 
+diff -urNad vdr-plugin-xineliboutput-0.99rc4+cvs20060811~/tools/udp_buffer.h vdr-plugin-xineliboutput-0.99rc4+cvs20060811/tools/udp_buffer.h
+--- vdr-plugin-xineliboutput-0.99rc4+cvs20060811~/tools/udp_buffer.h	2006-06-03 12:04:28.000000000 +0200
++++ vdr-plugin-xineliboutput-0.99rc4+cvs20060811/tools/udp_buffer.h	2006-08-12 12:19:05.000000000 +0200
+@@ -64,7 +64,8 @@
+       for(int i=0; i<UDP_BUFFER_SIZE; i++)
+ 	if(m_UdpBuffer[i]) {
+ 	  //m_UdpBufLen[i] = 0;
+-	  DELETENULL(m_UdpBuffer[i]);
++          delete[] m_UdpBuffer[i];
++          m_UdpBuffer[i] = NULL;
+ 	}
+     }
+ 
+@@ -87,9 +88,11 @@
+       int BufIndex = m_SeqNo & UDP_BUFFER_MASK;
+       
+       // old buffer too small ? free it
+-      if(m_UdpBuffer[BufIndex] && m_UdpBufLen[BufIndex] < UdpPacketLen) 
+-	DELETENULL(m_UdpBuffer[BufIndex]);
+-
++      if(m_UdpBuffer[BufIndex] && m_UdpBufLen[BufIndex] < UdpPacketLen) {
++        delete[] m_UdpBuffer[BufIndex];
++        m_UdpBuffer[BufIndex] = NULL;
++      }
++      
+       // no buffer ? alloc it
+       if(!m_UdpBuffer[BufIndex]) {
+ 	m_UdpBuffer[BufIndex] = (stream_udp_header_t*)new uchar[UdpPacketLen];


Property changes on: vdr/vdr-plugin-xineliboutput/trunk/debian/patches/02_mismatched-delete.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Added: vdr/vdr-plugin-xineliboutput/trunk/debian/patches/03_memleaks.dpatch
===================================================================
--- vdr/vdr-plugin-xineliboutput/trunk/debian/patches/03_memleaks.dpatch	2006-08-11 21:01:56 UTC (rev 3132)
+++ vdr/vdr-plugin-xineliboutput/trunk/debian/patches/03_memleaks.dpatch	2006-08-12 11:46:02 UTC (rev 3133)
@@ -0,0 +1,30 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 03_memleaks.dpatch by Tobias Grimm <tg at e-tobi.net>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad vdr-plugin-xineliboutput-0.99rc4+cvs20060811~/tools/cxsocket.h vdr-plugin-xineliboutput-0.99rc4+cvs20060811/tools/cxsocket.h
+--- vdr-plugin-xineliboutput-0.99rc4+cvs20060811~/tools/cxsocket.h	2006-07-26 02:55:09.000000000 +0200
++++ vdr-plugin-xineliboutput-0.99rc4+cvs20060811/tools/cxsocket.h	2006-08-12 12:55:11.000000000 +0200
+@@ -221,14 +221,17 @@
+ 	   "\r\n",
+ 	   m_Port);
+   int testlen = strlen(test);
++  int result;
+   if(testlen != sendto(fd_discovery, test, testlen, 0,
+ 		       (struct sockaddr *)&sin, sizeof(sin))) {
+     LOGERR("UDP broadcast send failed (discovery)");
+-    return -1;
++    result = -1;
+   } else {
+     LOGDBG("UDP broadcast send succeed (discovery)");
++    result = 1;
+   }
+-  return 1;
++  free(test);
++  return result;
+ }
+ 
+ 


Property changes on: vdr/vdr-plugin-xineliboutput/trunk/debian/patches/03_memleaks.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Modified: vdr/vdr-plugin-xineliboutput/trunk/debian/rules
===================================================================
--- vdr/vdr-plugin-xineliboutput/trunk/debian/rules	2006-08-11 21:01:56 UTC (rev 3132)
+++ vdr/vdr-plugin-xineliboutput/trunk/debian/rules	2006-08-12 11:46:02 UTC (rev 3133)
@@ -19,7 +19,7 @@
 endif
 
 # To use dpatch uncomment the following line and set Build-Depends to dpatch
-# DPATCH=yes
+DPATCH=yes
 
 ifdef DPATCH
 include /usr/share/dpatch/dpatch.make

More information about the pkg-vdr-dvb-changes mailing list