Fixing bug 29041

5 files changed, 138 insertions, 10 deletions

diff --git a/media-video/camserv/ChangeLog b/media-video/camserv/ChangeLog
index cdd8e6333ece..d6abd8e08b0b 100644
--- a/media-video/camserv/ChangeLog
+++ b/media-video/camserv/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/camserv
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/camserv/ChangeLog,v 1.7 2003/07/12 21:12:32 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/camserv/ChangeLog,v 1.8 2003/10/06 08:21:23 phosphan Exp $
+
+  06 Oct 2003; Patrick Kursawe <phosphan@gentoo.org> camserv-0.5.0.ebuild,
+  camserv-0.5.1-r2.ebuild, files/camserv-0.5-errno.patch:
+  Added patch for the "errno" issue, see bug 29041.
 
 *camserv-0.5.1-r2 (19 Jun 2003)
 
diff --git a/media-video/camserv/Manifest b/media-video/camserv/Manifest
index e0dc39ad906b..6cd84c070f36 100644
--- a/media-video/camserv/Manifest
+++ b/media-video/camserv/Manifest
@@ -1,10 +1,11 @@
-MD5 d29d96e3a811bcd271ff3ec9027d4c81 ChangeLog 1315
-MD5 2a2f9b2f13e895f9c13e288926f5fc63 camserv-0.5.0.ebuild 706
-MD5 a016d3cb344aa9ee65a8fa234b590578 camserv-0.5.1-r1.ebuild 1091
+MD5 9efad0acf8312512cc9439deb4ce0e56 camserv-0.5.1-r2.ebuild 1285
 MD5 2d9d1884da11ba9d62d86412e8422a98 camserv-0.5.1.ebuild 695
-MD5 3b08c69cec2ae319a5cef3fb195f0271 camserv-0.5.1-r2.ebuild 1203
-MD5 c473cf955721d867b267d2ca2c0d32ae files/digest-camserv-0.5.0 65
-MD5 0cc8188d6f8abfc2eb25e9b9352283ac files/digest-camserv-0.5.1 65
+MD5 a016d3cb344aa9ee65a8fa234b590578 camserv-0.5.1-r1.ebuild 1091
+MD5 da47ace1238f9d03c15e3fc1821976c3 ChangeLog 1505
+MD5 406bd72b6f128dc3bc956c0b6a4dcf1f camserv-0.5.0.ebuild 806
 MD5 0cc8188d6f8abfc2eb25e9b9352283ac files/digest-camserv-0.5.1-r1 65
-MD5 e071f954a6684d1a34a7afe4efe807bc files/camserv.init 561
 MD5 0cc8188d6f8abfc2eb25e9b9352283ac files/digest-camserv-0.5.1-r2 65
+MD5 e071f954a6684d1a34a7afe4efe807bc files/camserv.init 561
+MD5 fb27a1787753b6c9ee46b573c6b8fc5e files/camserv-0.5-errno.patch 3105
+MD5 c473cf955721d867b267d2ca2c0d32ae files/digest-camserv-0.5.0 65
+MD5 0cc8188d6f8abfc2eb25e9b9352283ac files/digest-camserv-0.5.1 65
diff --git a/media-video/camserv/camserv-0.5.0.ebuild b/media-video/camserv/camserv-0.5.0.ebuild
index a54ad9545893..daf40654f53c 100644
--- a/media-video/camserv/camserv-0.5.0.ebuild
+++ b/media-video/camserv/camserv-0.5.0.ebuild
@@ -1,6 +1,9 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/camserv/camserv-0.5.0.ebuild,v 1.8 2003/09/08 07:41:44 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/camserv/camserv-0.5.0.ebuild,v 1.9 2003/10/06 08:21:23 phosphan Exp $
+
+
+inherit eutils
 
 S=${WORKDIR}/${P}
 DESCRIPTION="A streaming video server."
@@ -14,6 +17,13 @@ KEYWORDS="x86"
 DEPEND=">=media-libs/jpeg-6b-r2
 	>=media-libs/imlib-1.9.13-r2"
 
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${PN}-0.5-errno.patch
+}
+
 src_compile() {
 
 	econf || die
diff --git a/media-video/camserv/camserv-0.5.1-r2.ebuild b/media-video/camserv/camserv-0.5.1-r2.ebuild
index 14b476b7a83a..9743ced0a5ab 100644
--- a/media-video/camserv/camserv-0.5.1-r2.ebuild
+++ b/media-video/camserv/camserv-0.5.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/camserv/camserv-0.5.1-r2.ebuild,v 1.2 2003/09/08 11:45:46 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/camserv/camserv-0.5.1-r2.ebuild,v 1.3 2003/10/06 08:21:23 phosphan Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="A streaming video server."
@@ -14,6 +14,12 @@ KEYWORDS="~x86"
 DEPEND=">=media-libs/jpeg-6b-r2
 	>=media-libs/imlib-1.9.13-r2"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${PN}-0.5-errno.patch
+}
+
 src_compile() {
 
 	_CC="${CC}"
diff --git a/media-video/camserv/files/camserv-0.5-errno.patch b/media-video/camserv/files/camserv-0.5-errno.patch
new file mode 100644
index 000000000000..130d6bcc2e87
--- /dev/null
+++ b/media-video/camserv/files/camserv-0.5-errno.patch
@@ -0,0 +1,107 @@
+diff -ur camserv/camserv.c camserv-0.5.1-gentoo/camserv/camserv.c
+--- camserv/camserv.c	2003-09-21 13:05:37.000000000 +1200
++++ camserv-0.5.1-gentoo/camserv/camserv.c	2003-09-21 13:21:19.000000000 +1200
+@@ -25,6 +25,7 @@
+ #include <stdarg.h>
+ #include <signal.h>
+ #include <sys/param.h>
++#include <errno.h>
+ 
+ #include "camconfig.h"
+ #include "camshm.h"
+@@ -153,7 +154,6 @@
+   CamConfig *camcfg;
+   char *shm_segment, tmpbuf[ 1024 ], cfg_path[ MAXPATHLEN ];
+   int fd, shm_alloc, donecfg;
+-  extern int errno;
+ 
+   donecfg = 0;
+   if (argc >= 2) {
+diff -ur camserv/main_loop.c camserv-0.5.1-gentoo/camserv/main_loop.c
+--- camserv/main_loop.c	2003-09-21 13:05:37.000000000 +1200
++++ camserv-0.5.1-gentoo/camserv/main_loop.c	2003-09-21 13:22:25.000000000 +1200
+@@ -3,6 +3,7 @@
+ #include <string.h>
+ #include <stdarg.h>
+ #include <signal.h>
++#include <errno.h>
+ 
+ #include "camserv.h"
+ #include "camconfig.h"
+@@ -14,8 +15,6 @@
+ #include "list.h"
+ #include "log.h"
+ 
+-extern int errno;
+-
+ static int Abort = 0;
+ 
+ #define CINFO_STATE_PREAMBLE    0
+diff -ur camserv/picture_loop.c camserv-0.5.1-gentoo/camserv/picture_loop.c
+--- camserv/picture_loop.c	2003-09-21 13:05:37.000000000 +1200
++++ camserv-0.5.1-gentoo/camserv/picture_loop.c	2003-09-21 13:25:33.000000000 +1200
+@@ -4,6 +4,7 @@
+ #include <dlfcn.h>
+ #include <sys/types.h>
+ #include <signal.h>
++#include <errno.h>
+ 
+ #include "camserv.h"
+ #include "camconfig.h"
+@@ -244,7 +245,6 @@
+ {
+   Filter *filters;
+   Video_Funcs vfuncs;
+-  extern int errno;
+   void *vid_device = NULL;
+   char *pic_snap = NULL, vidsec[ 1024 ];
+   Video_Geometry geom;
+diff -ur camserv/video_fbsd_bttv.c camserv-0.5.1-gentoo/camserv/video_fbsd_bttv.c
+--- camserv/video_fbsd_bttv.c	2003-09-21 13:05:37.000000000 +1200
++++ camserv-0.5.1-gentoo/camserv/video_fbsd_bttv.c	2003-09-21 13:38:59.000000000 +1200
+@@ -32,13 +32,12 @@
+ #include <signal.h>
+ #include <sys/ioctl.h>
+ #include <unistd.h>
++#include <errno.h>
+ 
+ #include "video.h"
+ #include "log.h"
+ #include "grafxmisc.h"
+ 
+-extern int errno;
+-
+ typedef struct fbttv_st {
+   char section_name[ 1024 ]; /* Section name of the given device module */
+   int initialized;           /* 1 if it has been initialzed, else 0     */
+diff -ur common/sock_field.c camserv-0.5.1-gentoo/common/sock_field.c
+--- common/sock_field.c	2003-09-21 13:05:36.000000000 +1200
++++ camserv-0.5.1-gentoo/common/sock_field.c	2003-09-21 13:39:59.000000000 +1200
+@@ -209,7 +209,6 @@
+ 		SockField_TimeoutFunc  timeout_func,
+ 		struct timeval *timeout ) 
+ {
+-  extern int errno;
+   SockField_Data sfdata;
+   int i;
+   struct timeval real_timeout;
+diff -ur relay/relay.c camserv-0.5.1-gentoo/relay/relay.c
+--- relay/relay.c	2003-09-21 13:05:36.000000000 +1200
++++ camserv-0.5.1-gentoo/relay/relay.c	2003-09-21 13:27:11.000000000 +1200
+@@ -22,6 +22,7 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <signal.h>
++#include <errno.h>
+ 
+ #include "databuf.h"
+ #include "socket.h"
+@@ -34,8 +35,6 @@
+ 
+ #define BACKLOG  20
+ 
+-extern int errno;
+-
+ #define CLIENT_T_UNK              0
+ #define CLIENT_T_CAMSERV          1
+ #define CLIENT_T_BROWSER          2