Merge lp:~ubuntu-branches/ubuntu/natty/gem/natty-201104220303 into lp:ubuntu/natty/gem

[James Westby]

The package history in the archive and the history in the bzr branch differ. As the archive is authoritative the history of lp:ubuntu/natty/gem now reflects that and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/natty/gem/natty-201104220303. A merge should be performed if necessary.

[Colin Watson (cjwatson)]

The importer already imported this revision. I'm not sure why it's trying to do so again in a slightly different way, but it isn't necessary.

review: Disapprove

Unmerged revisions

15. By Andreas Moog on 2011-04-21

* debian/rules, debian/patches/04_v4l1.patch:
  - disable v4l1 as it has been removed from the kernel
  (LP: #756070) (Closes: #621956)

=== added file '.pc/.quilt_patches'
--- .pc/.quilt_patches	1970-01-01 00:00:00 +0000
+++ .pc/.quilt_patches	2011-04-22 03:07:25 +0000
@@ -0,0 +1,1 @@
+debian/patches

=== added file '.pc/.quilt_series'
--- .pc/.quilt_series	1970-01-01 00:00:00 +0000
+++ .pc/.quilt_series	2011-04-22 03:07:25 +0000
@@ -0,0 +1,1 @@
+series

=== added file '.pc/01_change_defaultfont.patch/.timestamp'
=== added file '.pc/02_manual_examples_install.patch/.timestamp'
=== added file '.pc/03_falign_default.patch/.timestamp'
=== added directory '.pc/04_v4l1.patch'
=== renamed directory '.pc/04_v4l1.patch' => '.pc/04_v4l1.patch.moved'
=== added file '.pc/04_v4l1.patch/.timestamp'
=== added directory '.pc/04_v4l1.patch/src'
=== added directory '.pc/04_v4l1.patch/src/Pixes'
=== added file '.pc/04_v4l1.patch/src/Pixes/videoV4L.h'
--- .pc/04_v4l1.patch/src/Pixes/videoV4L.h	1970-01-01 00:00:00 +0000
+++ .pc/04_v4l1.patch/src/Pixes/videoV4L.h	2011-04-22 03:07:25 +0000
@@ -0,0 +1,162 @@
+/*-----------------------------------------------------------------
+
+    GEM - Graphics Environment for Multimedia
+
+    Load an video into a pix block
+
+    Copyright (c) 1997-1999 Mark Danks. [e-mail]
+    Copyright (c) Günther Geiger. [e-mail]
+    Copyright (c) 2001-2002 IOhannes m zmoelnig. forum::für::umläute. IEM. [e-mail]
+    For information on usage and redistribution, and for a DISCLAIMER OF ALL
+    WARRANTIES, see the file, "GEM.LICENSE.TERMS" in this distribution.
+
+    Linux version by Miller Puckette. [e-mail]
+	
+-----------------------------------------------------------------*/
+
+#ifndef INCLUDE_VIDEOV4L_H_
+#define INCLUDE_VIDEOV4L_H_
+
+#include "Pixes/video.h"
+
+#if defined HAVE_LIBV4L1 && !defined HAVE_VIDEO4LINUX
+# define HAVE_VIDEO4LINUX
+#endif
+
+#ifdef HAVE_VIDEO4LINUX
+# ifdef HAVE_LIBV4L1
+#  include <libv4l1.h> 
+# endif /* HAVE_LIBV4L1 */
+
+# include <stdio.h>
+# include <stdlib.h>
+# include <stdarg.h>
+# include <unistd.h>
+# include <string.h>
+# include <ctype.h>
+# include <fcntl.h>
+# include <errno.h>
+# include <sys/ioctl.h>
+# include <sys/types.h>
+# include <sys/time.h>
+# include <linux/types.h>
+# include <linux/videodev.h>
+# include <sys/mman.h>
+//#ifdef HAVE_PTHREADS
+# include <pthread.h>
+//#endif
+# define V4L_DEVICENO 0
+# define V4L_NBUF 2
+# define V4L_COMPOSITEIN 1
+#endif
+/*-----------------------------------------------------------------
+-------------------------------------------------------------------
+CLASS
+	pix_video
+    
+    Loads in a video
+    
+KEYWORDS
+    pix
+    
+DESCRIPTION
+
+    "dimen" (int, int) - set the x,y dimensions
+    "zoom" (int, int) - the zoom factor (1.0 is nominal) (num / denom)
+    "bright" (int) - the brightnes
+    "contrast" (int) - the contrast
+    "hue" (int) - the hue
+    "sat" (int) - the saturation
+    
+-----------------------------------------------------------------*/
+class GEM_EXTERN videoV4L : public video {
+    public:
+        //////////
+        // Constructor
+    	videoV4L(int format=0);
+    	    	
+    	//////////
+    	// Destructor
+    	virtual ~videoV4L();
+
+#ifdef HAVE_VIDEO4LINUX
+	////////
+	// open the video-device
+	virtual int            openDevice(int devnum, int format=0){return 1;}
+	virtual void          closeDevice(void){}
+	virtual int           resetDevice(void){return 1;}
+    
+    	//////////
+    	// Start up the video device
+    	// [out] int - returns 0 if bad
+    	int	    	startTransfer(int format=0);
+	//////////
+    	// Stop the video device
+    	// [out] int - returns 0 if bad
+    	int	   	stopTransfer();
+
+	//////////
+	// get the next frame
+	pixBlock    *getFrame();
+
+	//////////
+	// Set the video dimensions
+  	virtual int	    	setDimen(int x, int y, int leftmargin, int rightmargin,
+					 int topmargin, int bottommargin);
+	virtual int	    	setChannel(int c, float f);
+	virtual int	    	setNorm(char*);
+	virtual int	    	setDevice(int);
+	virtual int	    	setDevice(char*);
+	virtual int	    	setColor(int);
+
+    
+ protected:
+
+  //-----------------------------------
+  // GROUP:	Linux specific video data
+  //-----------------------------------
+	
+  struct video_tuner vtuner;
+  struct video_picture vpicture;
+  struct video_buffer vbuffer;
+  struct video_capability vcap;
+  struct video_channel vchannel;
+  struct video_audio vaudio;
+  struct video_mbuf vmbuf;
+  struct video_mmap vmmap[V4L_NBUF];
+  int tvfd;
+  int frame, last_frame;
+  unsigned char *videobuf;
+  int skipnext;
+  int mytopmargin, mybottommargin;
+  int myleftmargin, myrightmargin;
+
+  int m_gotFormat; // the format returned by the v4l-device (not an openGL-format!)
+  bool m_colorConvert; // do we have to convert the colour-space manually ?
+  
+  //////////
+  // the capturing thread
+  pthread_t m_thread_id;
+  bool      m_continue_thread;
+  bool      m_frame_ready;
+
+  /* capture frames (in a separate thread! */
+  void*capturing(void); 
+  /* static callback for pthread_create: calls capturing() */
+  static void*capturing_(void*);
+
+  // rendering might be needed when we are currently not capturing because we cannot (e.g: couldn't open device)
+  // although we should. when reopening another device, we might be able to render again...
+  // example: we have only 1 video-device /dev/video0;
+  // when we try to open /dev/video1 we fail, and m_capturing is set to 0
+  // now when rendering is turned on and we want to switch back to /dev/video0 we should reconnect to the good device
+  bool      m_rendering; // "true" when rendering is on, false otherwise
+
+
+  /* use this in the capture-thread to cleanup */
+  bool      m_stopTransfer;
+#endif /* HAVE_VIDEO4LINUX */
+
+};
+
+#endif	// for header file

=== added file '.pc/99_gcc_4-4.patch/.timestamp'
=== added file 'debian/patches/04_v4l1.patch'
--- debian/patches/04_v4l1.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/04_v4l1.patch	2011-04-22 03:07:25 +0000
@@ -0,0 +1,18 @@
+## Description: don't include obsolete v4l1 headers
+## Origin/Author: Andreas Moog <[e-mail]>
+## Bug-Ubuntu: https://launchpad.net/bugs/756070
+## Bug-Debian: http://bugs.debian.org/621956
+## Bug: http://sourceforge.net/support/tracker.php?aid=3290926
+Index: gem/src/Pixes/videoV4L.h
+===================================================================
+--- gem.orig/src/Pixes/videoV4L.h	2011-04-21 14:23:23.683662525 +0200
++++ gem/src/Pixes/videoV4L.h	2011-04-21 14:23:19.823859321 +0200
+@@ -40,7 +40,7 @@
+ # include <sys/types.h>
+ # include <sys/time.h>
+ # include <linux/types.h>
+-# include <linux/videodev.h>
++//# include <linux/videodev.h>
+ # include <sys/mman.h>
+ //#ifdef HAVE_PTHREADS
+ # include <pthread.h>

=== renamed file 'debian/patches/04_v4l1.patch' => 'debian/patches/04_v4l1.patch.moved'