packages: xvidcap/xvidcap-ffmpeg.patch, xvidcap/xvidcap.spec, xvidcap/xvidc...

[mmazur]

Author: mmazur                       Date: Sat May 29 20:25:02 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 4, the old version was missing a link to ffmpeg and didn't work
- stbr
- this software is old and unmaintained, it's still buggy (one menu is missing :)

---- Files affected:
packages/xvidcap:
   xvidcap-ffmpeg.patch (1.5 -> 1.6) , xvidcap.spec (1.36 -> 1.37) , xvidcap-x11.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/xvidcap/xvidcap-ffmpeg.patch
diff -u packages/xvidcap/xvidcap-ffmpeg.patch:1.5 packages/xvidcap/xvidcap-ffmpeg.patch:1.6
--- packages/xvidcap/xvidcap-ffmpeg.patch:1.5	Sat Oct 18 13:24:19 2008
+++ packages/xvidcap/xvidcap-ffmpeg.patch	Sat May 29 22:24:57 2010
@@ -66,3 +66,13 @@
      st->codec->flags &= ~CODEC_FLAG_OBMC;
      // some formats want stream headers to be seperate
      if (oc->oformat->flags & AVFMT_GLOBALHEADER)
+--- xvidcap-1.1.7/src/xtoffmpeg.c	2010-05-29 22:15:55.764497747 +0200
++++ xvidcap-1.1.7.new/src/xtoffmpeg.c	2010-05-29 21:55:21.654498517 +0200
+@@ -61,7 +61,6 @@
+ #include <libavdevice/avdevice.h>
+ //#include <ffmpeg/dsputil.h>
+ #include <libswscale/swscale.h>
+-#include <libswscale/rgb2rgb.h>
+ #include <libavutil/fifo.h>
+ #define swscale_isRGB(x) ((x)==PIX_FMT_BGR32 || (x)==PIX_FMT_RGB24 \
+                         || (x)==PIX_FMT_RGB565 || (x)==PIX_FMT_RGB555 \

================================================================
Index: packages/xvidcap/xvidcap.spec
diff -u packages/xvidcap/xvidcap.spec:1.36 packages/xvidcap/xvidcap.spec:1.37
--- packages/xvidcap/xvidcap.spec:1.36	Mon Oct 20 19:21:22 2008
+++ packages/xvidcap/xvidcap.spec	Sat May 29 22:24:57 2010
@@ -7,13 +7,14 @@
 Summary(pl.UTF-8):	XVidCap - przechwytywanie obrazu dla X
 Name:		xvidcap
 Version:	1.1.7
-Release:	3
+Release:	4
 Epoch:		1
 License:	GPL
 Group:		X11/Applications/Graphics
 Source0:	http://dl.sourceforge.net/xvidcap/%{name}-%{version}.tar.gz
 # Source0-md5:	b39a682d3ef9fcbf424af771936780e2
 Patch0:		%{name}-ffmpeg.patch
+Patch1:     %{name}-x11.patch
 URL:		http://xvidcap.sourceforge.net/
 BuildRequires:	autoconf >= 2.57
 BuildRequires:	automake
@@ -57,6 +58,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %{__intltoolize}
@@ -111,6 +113,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.37  2010/05/29 20:24:57  mmazur
+- rel 4, the old version was missing a link to ffmpeg and didn't work
+- stbr
+- this software is old and unmaintained, it's still buggy (one menu is missing :)
+
 Revision 1.36  2008/10/20 17:21:22  qboosh
 - updated ffmpeg version
 

================================================================
Index: packages/xvidcap/xvidcap-x11.patch
diff -u /dev/null packages/xvidcap/xvidcap-x11.patch:1.1
--- /dev/null	Sat May 29 22:25:02 2010
+++ packages/xvidcap/xvidcap-x11.patch	Sat May 29 22:24:57 2010
@@ -0,0 +1,11 @@
+--- xvidcap-1.1.7/src/capture.c	2008-05-26 00:01:53.000000000 +0200
++++ xvidcap-1.1.7.new/src/capture.c	2010-05-29 21:54:40.514498033 +0200
+@@ -65,7 +65,7 @@
+ #include <sys/ipc.h>
+ #include <sys/shm.h>
+ #include <X11/extensions/XShm.h>
+-#include <X11/extensions/shmstr.h>
++#include <X11/extensions/shmproto.h>
+ #ifndef SOLARIS
+ #include <X11/extensions/extutil.h>
+ #endif     // SOLARIS
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xvidcap/xvidcap-ffmpeg.patch?r1=1.5&r2=1.6&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xvidcap/xvidcap.spec?r1=1.36&r2=1.37&f=u