r7747 - in /vdr/vdr-plugin-softdevice/trunk/debian: changelog control patches/04_debian_ffmpeg.dpatch
tiber-guest at users.alioth.debian.org
tiber-guest at users.alioth.debian.org
Fri May 1 19:00:12 UTC 2009
Author: tiber-guest
Date: Fri May 1 19:00:12 2009
New Revision: 7747
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/?sc=1&rev=7747
Log:
* Updated 04_debian_ffmpeg.dpatch
* Dropped build dependency to libdfb++-dev - this package has been orphaned
and removed from Debian, so DFB++ is not supported anymore right now
Modified:
vdr/vdr-plugin-softdevice/trunk/debian/changelog
vdr/vdr-plugin-softdevice/trunk/debian/control
vdr/vdr-plugin-softdevice/trunk/debian/patches/04_debian_ffmpeg.dpatch
Modified: vdr/vdr-plugin-softdevice/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-softdevice/trunk/debian/changelog?rev=7747&op=diff
==============================================================================
--- vdr/vdr-plugin-softdevice/trunk/debian/changelog (original)
+++ vdr/vdr-plugin-softdevice/trunk/debian/changelog Fri May 1 19:00:12 2009
@@ -1,3 +1,11 @@
+vdr-plugin-softdevice (0.5.0-6) UNRELEASED; urgency=low
+
+ * Updated 04_debian_ffmpeg.dpatch
+ * Dropped build dependency to libdfb++-dev - this package has been orphaned
+ and removed from Debian, so DFB++ is not supported anymore right now
+
+ -- Tobias Grimm <etobi at debian.org> Fri, 01 May 2009 20:50:57 +0200
+
vdr-plugin-softdevice (0.5.0-5) experimental; urgency=low
* Release for vdrdevel 1.7.6
Modified: vdr/vdr-plugin-softdevice/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-softdevice/trunk/debian/control?rev=7747&op=diff
==============================================================================
--- vdr/vdr-plugin-softdevice/trunk/debian/control (original)
+++ vdr/vdr-plugin-softdevice/trunk/debian/control Fri May 1 19:00:12 2009
@@ -5,7 +5,7 @@
Uploaders: Thomas Schmidt <tschmidt at debian.org>, Nicolas Huillard <nicolas at huillard.net>, Tobias Grimm <etobi at debian.org>, Thomas Günther <tom at toms-cafe.de>
Build-Depends: debhelper (>= 5), cdbs, dpatch, vdr-dev (>= 1.6.0-5), gettext,
pkg-config, libavcodec-dev (>= 0.cvs20060329-4), libavformat-dev (>= 0.cvs20060329-4),
- libswscale-dev, libasound2-dev, libdfb++-dev, libdirectfb-dev, libxv-dev, libx11-dev,
+ libswscale-dev, libasound2-dev, libdirectfb-dev, libxv-dev, libx11-dev,
libxext-dev, zlib1g-dev, libxinerama-dev
Standards-Version: 3.8.1
Vcs-Svn: svn://svn.debian.org/pkg-vdr-dvb/vdr/vdr-plugin-softdevice/trunk/
Modified: vdr/vdr-plugin-softdevice/trunk/debian/patches/04_debian_ffmpeg.dpatch
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-softdevice/trunk/debian/patches/04_debian_ffmpeg.dpatch?rev=7747&op=diff
==============================================================================
--- vdr/vdr-plugin-softdevice/trunk/debian/patches/04_debian_ffmpeg.dpatch (original)
+++ vdr/vdr-plugin-softdevice/trunk/debian/patches/04_debian_ffmpeg.dpatch Fri May 1 19:00:12 2009
@@ -2,24 +2,178 @@
## 04_debian_ffmpeg.dpatch by Tobias Grimm <tg at e-tobi.net>
##
## All lines beginning with `## DP:' are a description of the patch.
-## DP: Compile with static Debian ffmpeg libs
+## DP: ffmpeg related fixes
@DPATCH@
-diff -urNad vdr-plugin-softdevice-0.2.2~/Makefile vdr-plugin-softdevice-0.2.2/Makefile
---- vdr-plugin-softdevice-0.2.2~/Makefile 2006-03-12 17:34:27.000000000 +0100
-+++ vdr-plugin-softdevice-0.2.2/Makefile 2006-03-12 17:35:06.000000000 +0100
-@@ -102,12 +102,12 @@
+diff -urNad vdr-plugin-softdevice-0.5.0~/MacVdrClient.c vdr-plugin-softdevice-0.5.0/MacVdrClient.c
+--- vdr-plugin-softdevice-0.5.0~/MacVdrClient.c 2007-05-10 21:57:19.000000000 +0200
++++ vdr-plugin-softdevice-0.5.0/MacVdrClient.c 2009-05-01 20:49:18.000000000 +0200
+@@ -166,11 +166,11 @@
+ ctl->max_width=IMAGE_WIDTH;
+ ctl->max_height=IMAGE_HEIGHT;
+ ctl->stride0=ctl->max_width*2;
+- ctl->format=PIX_FMT_YUV422;
++ ctl->format=PIX_FMT_YUYV422;
+
+ pict_shmid_sav=ctl->pict_shmid=vout->pic_shm_id;
+
+- picture.format=PIX_FMT_YUV422;
++ picture.format=PIX_FMT_YUYV422;
+ picture.stride[0]=ctl->stride0;
+ picture.pixel[0]=NULL;
+
+diff -urNad vdr-plugin-softdevice-0.5.0~/Makefile vdr-plugin-softdevice-0.5.0/Makefile
+--- vdr-plugin-softdevice-0.5.0~/Makefile 2008-04-14 04:52:10.000000000 +0200
++++ vdr-plugin-softdevice-0.5.0/Makefile 2009-05-01 20:49:18.000000000 +0200
+@@ -100,12 +100,12 @@
#FFMPEGCFLAGS=-I../../../../ffmpeg/libavcodec
#
# If you installed ffmpeg's lib (make installlib)
-FFMPEGCFLAGS=-I/usr/local/include/ffmpeg/
-+FFMPEGCFLAGS=`ffmpeg-config --cflags`
++FFMPEGCFLAGS=`pkg-config --cflags libavcodec libavformat`
#FFMPEGCFLAGS=-I/home/extra/src/video/ffmpeg-0.4.8/libavcodec
#
#
# DON'T touch this:
-FFMPEGLIBS = -lavcodec -lavformat -lz
-+FFMPEGLIBS = `ffmpeg-config --libs avcodec avformat`
++FFMPEGLIBS = `pk-config --libs libavcodec libavformat`
#
# -----------------------------------------------------------------------------
# Depending on your ffmpeg lib you may need some additional libs
+diff -urNad vdr-plugin-softdevice-0.5.0~/PicBuffer.c vdr-plugin-softdevice-0.5.0/PicBuffer.c
+--- vdr-plugin-softdevice-0.5.0~/PicBuffer.c 2007-07-11 22:04:22.000000000 +0200
++++ vdr-plugin-softdevice-0.5.0/PicBuffer.c 2009-05-01 20:49:18.000000000 +0200
+@@ -83,8 +83,8 @@
+ memset(Pic->pixel[2],(color&0xFF),
+ (Pic->max_height>>1)*Pic->stride[2]);
+ break;
+- case PIX_FMT_RGBA32 :
+- case PIX_FMT_YUV422 :
++ case PIX_FMT_RGB32 :
++ case PIX_FMT_YUYV422 :
+ {
+ uint32_t *tmp=(uint32_t *)Pic->pixel[0];
+ int i=Pic->max_height*
+@@ -108,7 +108,7 @@
+ int pixel_size=GetFormatBPP(Pic->format);
+
+ switch (Pic->format) {
+- case PIX_FMT_RGBA32 :
++ case PIX_FMT_RGB32 :
+ case PIX_FMT_RGB24 :
+ case PIX_FMT_BGR24 :
+ case PIX_FMT_RGB555 :
+@@ -122,7 +122,7 @@
+ memset(Pic->pixel[2],128,
+ (Pic->max_height>>1)*Pic->stride[2]);
+ break;
+- case PIX_FMT_YUV422 :
++ case PIX_FMT_YUYV422 :
+ {
+ uint32_t *tmp=(uint32_t *)Pic->pixel[0];
+ for (int i=0; i<Pic->max_height*
+@@ -139,7 +139,7 @@
+
+ yuv420_convert_fct GetYuv420ConvertFct(PixelFormat pix_fmt) {
+ switch (pix_fmt) {
+- case PIX_FMT_RGBA32:
++ case PIX_FMT_RGB32:
+ return &yuv420_to_rgb32;
+ case PIX_FMT_BGR24:
+ return &yuv420_to_bgr24;
+@@ -149,7 +149,7 @@
+ return &yuv420_to_rgb15;
+ case PIX_FMT_RGB565:
+ return &yuv420_to_rgb16;
+- case PIX_FMT_YUV422:
++ case PIX_FMT_YUYV422:
+ return &yuv420_to_yuy2;
+ default:
+ fprintf(stderr,"unsupported format in GetYuv420ConvertFct \n");
+@@ -251,10 +251,10 @@
+ switch(fmt){
+ case PIX_FMT_RGB555:
+ case PIX_FMT_RGB565:
+- case PIX_FMT_YUV422:
++ case PIX_FMT_YUYV422:
+ case PIX_FMT_RGB24:
+ case PIX_FMT_BGR24:
+- case PIX_FMT_RGBA32:
++ case PIX_FMT_RGB32:
+ return false;
+ break;
+ default:
+@@ -277,7 +277,7 @@
+ switch(fmt){
+ case PIX_FMT_RGB555:
+ case PIX_FMT_RGB565:
+- case PIX_FMT_YUV422:
++ case PIX_FMT_YUYV422:
+ //case PIX_FMT_UYVY422: // FIXME which ffmpeg version
+ pixel_size=2;
+ break;
+@@ -285,7 +285,7 @@
+ case PIX_FMT_BGR24:
+ pixel_size=3;
+ break;
+- case PIX_FMT_RGBA32:
++ case PIX_FMT_RGB32:
+ pixel_size=4;
+ break;
+ default:
+diff -urNad vdr-plugin-softdevice-0.5.0~/video-fb.c vdr-plugin-softdevice-0.5.0/video-fb.c
+--- vdr-plugin-softdevice-0.5.0~/video-fb.c 2008-02-26 11:53:22.000000000 +0100
++++ vdr-plugin-softdevice-0.5.0/video-fb.c 2009-05-01 20:49:18.000000000 +0200
+@@ -60,7 +60,7 @@
+ Bpp=15;
+ else Bpp=fb_vinfo.bits_per_pixel;
+ switch (Bpp) {
+- case 32 : privBuf.format=PIX_FMT_RGBA32;
++ case 32 : privBuf.format=PIX_FMT_RGB32;
+ break;
+ case 24 : privBuf.format=PIX_FMT_RGB24;
+ break;
+diff -urNad vdr-plugin-softdevice-0.5.0~/video-shm.c vdr-plugin-softdevice-0.5.0/video-shm.c
+--- vdr-plugin-softdevice-0.5.0~/video-shm.c 2007-10-13 13:17:48.000000000 +0200
++++ vdr-plugin-softdevice-0.5.0/video-shm.c 2009-05-01 20:49:18.000000000 +0200
+@@ -235,8 +235,8 @@
+ privBuf.stride[1]=ctl->stride1;
+ privBuf.stride[2]=ctl->stride2;
+ break;
+- case PIX_FMT_YUV422:
+- SHMDEB("new format YUV422\n");
++ case PIX_FMT_YUYV422:
++ SHMDEB("new format YUYV422\n");
+ privBuf.pixel[0]=curr_pict+ctl->offset0;
+ privBuf.pixel[1]=privBuf.pixel[1]=NULL;
+ privBuf.stride[0]=ctl->stride0;
+diff -urNad vdr-plugin-softdevice-0.5.0~/video-xv.c vdr-plugin-softdevice-0.5.0/video-xv.c
+--- vdr-plugin-softdevice-0.5.0~/video-xv.c 2007-12-25 17:57:41.000000000 +0100
++++ vdr-plugin-softdevice-0.5.0/video-xv.c 2009-05-01 20:49:18.000000000 +0200
+@@ -1034,7 +1034,7 @@
+ osd_max_width, osd_max_height,
+ osd_image->bytes_per_line,osd_image->bits_per_pixel);
+ switch (osd_image->bits_per_pixel) {
+- case 32 : osdBuf.format=PIX_FMT_RGBA32;
++ case 32 : osdBuf.format=PIX_FMT_RGB32;
+ break;
+ case 24 : osdBuf.format=PIX_FMT_RGB24;
+ break;
+@@ -1240,7 +1240,7 @@
+ attributeStore.Save();
+
+ switch (osdBuf.format) {
+- case PIX_FMT_RGBA32:
++ case PIX_FMT_RGB32:
+ ARGB_TO_RGB(RGB32,&colorkey,COLOR_KEY);
+ break;
+ case PIX_FMT_RGB24:
+@@ -1300,7 +1300,7 @@
+ privBuf.stride[1] = 0;
+ privBuf.stride[2] = 0;
+
+- privBuf.format = PIX_FMT_YUV422;
++ privBuf.format = PIX_FMT_YUYV422;
+ break;
+ default:
+ break;
More information about the pkg-vdr-dvb-changes
mailing list