r1652 - in vdr/vdr-plugin-osdtest256/trunk: . debian debian/patches
Thomas Günther
tom-guest at costa.debian.org
Sun Dec 18 23:21:28 UTC 2005
Author: tom-guest
Date: 2005-12-18 23:21:28 +0000 (Sun, 18 Dec 2005)
New Revision: 1652
Added:
vdr/vdr-plugin-osdtest256/trunk/debian/
vdr/vdr-plugin-osdtest256/trunk/debian/changelog
vdr/vdr-plugin-osdtest256/trunk/debian/compat
vdr/vdr-plugin-osdtest256/trunk/debian/control
vdr/vdr-plugin-osdtest256/trunk/debian/copyright
vdr/vdr-plugin-osdtest256/trunk/debian/docs
vdr/vdr-plugin-osdtest256/trunk/debian/install
vdr/vdr-plugin-osdtest256/trunk/debian/patches/
vdr/vdr-plugin-osdtest256/trunk/debian/patches/00list
vdr/vdr-plugin-osdtest256/trunk/debian/patches/01_Makefile-fPIC-fix.dpatch
vdr/vdr-plugin-osdtest256/trunk/debian/patches/02_support1MB.dpatch
vdr/vdr-plugin-osdtest256/trunk/debian/patches/95_vdrdevel.dpatch
vdr/vdr-plugin-osdtest256/trunk/debian/rules
vdr/vdr-plugin-osdtest256/trunk/debian/watch
Log:
Load newtrunk into vdr/vdr-plugin-osdtest256/trunk.
Added: vdr/vdr-plugin-osdtest256/trunk/debian/changelog
===================================================================
--- vdr/vdr-plugin-osdtest256/trunk/debian/changelog 2005-12-18 23:21:13 UTC (rev 1651)
+++ vdr/vdr-plugin-osdtest256/trunk/debian/changelog 2005-12-18 23:21:28 UTC (rev 1652)
@@ -0,0 +1,8 @@
+vdr-plugin-osdtest256 (0.1.0-1) unstable; urgency=low
+
+ * Initial Release.
+ * Thomas Günther <tom at toms-cafe.de>
+ - Added 02_support1MB.dpatch
+
+ -- Torsten Lang <vdr at torstenlang.de> Thu, 08 Dec 2005 21:22:50 +0200
+
Added: vdr/vdr-plugin-osdtest256/trunk/debian/compat
===================================================================
--- vdr/vdr-plugin-osdtest256/trunk/debian/compat 2005-12-18 23:21:13 UTC (rev 1651)
+++ vdr/vdr-plugin-osdtest256/trunk/debian/compat 2005-12-18 23:21:28 UTC (rev 1652)
@@ -0,0 +1 @@
+4
Added: vdr/vdr-plugin-osdtest256/trunk/debian/control
===================================================================
--- vdr/vdr-plugin-osdtest256/trunk/debian/control 2005-12-18 23:21:13 UTC (rev 1651)
+++ vdr/vdr-plugin-osdtest256/trunk/debian/control 2005-12-18 23:21:28 UTC (rev 1652)
@@ -0,0 +1,15 @@
+Source: vdr-plugin-osdtest256
+Section: misc
+Priority: extra
+Maintainer: Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>
+Uploaders: Thomas Günther <tom at toms-cafe.de>, Tobias Grimm <tg at e-tobi.net>, Thomas Schmidt <tschmidt at debian.org>
+Build-Depends: debhelper (>> 4.1.16), vdr-dev (>= 1.3.37-1), dpatch (>= 2.0.9)
+Standards-Version: 3.6.2
+
+Package: vdr-plugin-osdtest256
+Architecture: any
+Depends: ${shlibs:Depends}, ${vdr:Depends}
+Conflicts: ${vdr:Conflicts}
+Description: Display a full color OSD
+ This Plugin displays a full color OSD to test modded (4MB) FF cards.
+XB-VDR-Patchlevel: ${vdr:Patchlevel}
Added: vdr/vdr-plugin-osdtest256/trunk/debian/copyright
===================================================================
--- vdr/vdr-plugin-osdtest256/trunk/debian/copyright 2005-12-18 23:21:13 UTC (rev 1651)
+++ vdr/vdr-plugin-osdtest256/trunk/debian/copyright 2005-12-18 23:21:28 UTC (rev 1652)
@@ -0,0 +1,11 @@
+This package was debianized by Torsten Lang <vdr at torstenlang.de> on
+Thu, 08 Dec 2005 21:30:43 +0200.
+
+It was downloaded from http://www.escape-edv.de/endriss/vdr/
+
+Upstream Author: Oliver Endriss <o.endriss at gmx.de>
+
+Copyright:
+
+It may be redistributed under the terms of the GNU GPL, Version 2
+found on Debian systems in the file /usr/share/common-licenses/GPL .
Added: vdr/vdr-plugin-osdtest256/trunk/debian/docs
===================================================================
--- vdr/vdr-plugin-osdtest256/trunk/debian/docs 2005-12-18 23:21:13 UTC (rev 1651)
+++ vdr/vdr-plugin-osdtest256/trunk/debian/docs 2005-12-18 23:21:28 UTC (rev 1652)
@@ -0,0 +1 @@
+README
Added: vdr/vdr-plugin-osdtest256/trunk/debian/install
===================================================================
--- vdr/vdr-plugin-osdtest256/trunk/debian/install 2005-12-18 23:21:13 UTC (rev 1651)
+++ vdr/vdr-plugin-osdtest256/trunk/debian/install 2005-12-18 23:21:28 UTC (rev 1652)
@@ -0,0 +1 @@
+libvdr-osdtest256.so.* usr/lib/vdr/plugins/
Added: vdr/vdr-plugin-osdtest256/trunk/debian/patches/00list
===================================================================
--- vdr/vdr-plugin-osdtest256/trunk/debian/patches/00list 2005-12-18 23:21:13 UTC (rev 1651)
+++ vdr/vdr-plugin-osdtest256/trunk/debian/patches/00list 2005-12-18 23:21:28 UTC (rev 1652)
@@ -0,0 +1,5 @@
+01_Makefile-fPIC-fix
+02_support1MB
+
+# convert package to vdrdevel
+95_vdrdevel
Added: vdr/vdr-plugin-osdtest256/trunk/debian/patches/01_Makefile-fPIC-fix.dpatch
===================================================================
--- vdr/vdr-plugin-osdtest256/trunk/debian/patches/01_Makefile-fPIC-fix.dpatch 2005-12-18 23:21:13 UTC (rev 1651)
+++ vdr/vdr-plugin-osdtest256/trunk/debian/patches/01_Makefile-fPIC-fix.dpatch 2005-12-18 23:21:28 UTC (rev 1652)
@@ -0,0 +1,20 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+
+## Makefile-fPIC-fix patch
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Adds -fPIC to Makefile to fix potential FTBFS.
+
+ at DPATCH@
+diff -urNad /usr/src/cvs/vdrdevel-plugin-rotor/Makefile vdrdevel-plugin-rotor/Makefile
+--- /usr/src/cvs/vdrdevel-plugin-rotor/Makefile Sun May 16 15:48:12 2004
++++ vdrdevel-plugin-rotor/Makefile Sat Sep 11 00:28:18 2004
+@@ -18,7 +18,7 @@
+ ### The C++ compiler and options:
+
+ CXX ?= g++
+-CXXFLAGS ?= -O2 -Wall -Woverloaded-virtual
++CXXFLAGS ?= -fPIC -O2 -Wall -Woverloaded-virtual
+
+ ### The directory environment:
+
Added: vdr/vdr-plugin-osdtest256/trunk/debian/patches/02_support1MB.dpatch
===================================================================
--- vdr/vdr-plugin-osdtest256/trunk/debian/patches/02_support1MB.dpatch 2005-12-18 23:21:13 UTC (rev 1651)
+++ vdr/vdr-plugin-osdtest256/trunk/debian/patches/02_support1MB.dpatch 2005-12-18 23:21:28 UTC (rev 1652)
@@ -0,0 +1,44 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 02_support1MB.dpatch by Thomas Günther <tom at toms-cafe.de>
+## http://toms-cafe.de/vdr/download/osdtest256-0.1.0-support1MB.diff
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Check whether the OSD can display the 4MB area, shrink it if necessary.
+
+ at DPATCH@
+--- osdtest256-0.1.0/osdtest256.c
++++ osdtest256-0.1.0/osdtest256.c
+@@ -29,19 +29,27 @@
+ if (osd)
+ {
+ tArea Area = { 0, 0, 599, 499, 8 };
++ if (osd->CanHandleAreas(&Area, 1) != oeOk)
++ {
++ // Set 1MB area
++ Area.x2 = 359;
++ Area.y2 = 251;
++ }
+ osd->SetAreas(&Area, 1);
+- osd->DrawRectangle(0, 0, 599, 499, clrGray50);
++ osd->DrawRectangle(0, 0, Area.x2, Area.y2, clrGray50);
+
++ int w = Area.Width() / 60;
++ int h = Area.Height() / 5;
+ for (int i = 0; i < 60; i++)
+- osd->DrawRectangle(10*i, 0,10*(i+1), 99, 0xff000000+0x040404*(60-i));
++ osd->DrawRectangle(w*i, 0,w*(i+1), h-1, 0xff000000+0x040404*(60-i));
+ for (int i = 0; i < 60; i++)
+- osd->DrawRectangle(10*i,100,10*(i+1),199, 0xff000000+((15+i*4)<<16));
++ osd->DrawRectangle(w*i, h,w*(i+1),2*h-1, 0xff000000+((15+i*4)<<16));
+ for (int i = 0; i < 60; i++)
+- osd->DrawRectangle(10*i,200,10*(i+1),299, 0xff000000+((15+(60-i)*4)<<8));
++ osd->DrawRectangle(w*i,2*h,w*(i+1),3*h-1, 0xff000000+((15+(60-i)*4)<<8));
+ for (int i = 0; i < 60; i++)
+- osd->DrawRectangle(10*i,300,10*(i+1),399, 0xff000000+(15+i*4));
++ osd->DrawRectangle(w*i,3*h,w*(i+1),4*h-1, 0xff000000+(15+i*4));
+ for (int i = 0; i < 60; i++)
+- osd->DrawRectangle(10*i,400,10*(i+1),499, 0xff000000+0x040404*(60-i));
++ osd->DrawRectangle(w*i,4*h,w*(i+1),5*h-1, 0xff000000+0x040404*(60-i));
+
+ osd->Flush();
+ }
Added: vdr/vdr-plugin-osdtest256/trunk/debian/patches/95_vdrdevel.dpatch
===================================================================
--- vdr/vdr-plugin-osdtest256/trunk/debian/patches/95_vdrdevel.dpatch 2005-12-18 23:21:13 UTC (rev 1651)
+++ vdr/vdr-plugin-osdtest256/trunk/debian/patches/95_vdrdevel.dpatch 2005-12-18 23:21:28 UTC (rev 1652)
@@ -0,0 +1,97 @@
+#!/bin/sh -e
+
+## 95_vdrdevel.dpatch by Thomas Günther <tom at toms-cafe.de>
+##
+## Version 0.1.4
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Substitute vdr -> vdrdevel and vice versa:
+## DP: 1. in includes of all source files (recursively)
+## DP: except for the files in PLUGIN/src/.
+## DP: 2. in contents of all files in debian directory (recursively)
+## DP: except for control, changelog, rules, watch, copyright
+## DP: and files in directories patches, patched and plugin-template.
+## DP: 3. in names of all files in debian directory (recursively)
+## DP: except files in directories patches and patched.
+## DP: Exceptions:
+## DP: libvdr-, svdrp, vdrrip, vdrcd, dvdrecord, vdradmin,
+## DP: vdr-xxv, vdr-patchlevel.
+## DP: Preserve mode, ownership and timestamps.
+
+if [ "$*" != "-patch" -a "$*" != "-unpatch" ]; then
+ echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+ exit 1
+fi
+
+# Check if this is a vdrdevel package
+/usr/bin/dh_listpackages | /bin/grep -q "^vdrdevel-" || exit 0
+
+# Create tempfile
+tmp_file=$(/bin/mktemp)
+
+# Define sed commands
+inc_subst="s.\(#[[:space:]]*include[[:space:]]*\)<vdr.\1<vdrdevel.; \
+ s.\(#[[:space:]]*include[[:space:]]*\)<vdrdeveldevel.\1<vdr.;"
+deb_subst="s.vdr.vdrdevel.g; \
+ s.vdrdeveldevel.vdr.g; \
+ s.libvdrdevel-.libvdr-.g; \
+ s.svdrdevelp.svdrp.g; \
+ s.vdrdevelrip.vdrrip.g; \
+ s.vdrdevelcd.vdrcd.g; \
+ s.dvdrdevelecord.dvdrecord.g; \
+ s.vdrdeveladmin.vdradmin.g; \
+ s.vdrdevel-xxv.vdr-xxv.g; \
+ s.vdrdevel-patchlevel.vdr-patchlevel.g;"
+
+# Includes of all source files
+files=$(/usr/bin/find ./ -type f \
+ -iregex ".*\.\(c\|h\|cc\|hh\|cpp\|hpp\)" \
+ -not -regex "\./PLUGINS/src/.*")
+if [ "$files" ]; then
+ for f in $files; do
+ /bin/chmod +w "$f"
+ /bin/cp -a -f "$f" "$tmp_file"
+ /bin/sed -e "$inc_subst" "$f" >"$tmp_file"
+ if ! /usr/bin/cmp -s "$f" "$tmp_file"; then
+ /usr/bin/touch -r "$f" "$tmp_file"
+ /bin/mv -f "$tmp_file" "$f"
+ echo "vdr includes substituted in $f"
+ fi
+ done
+fi
+
+# Files in debian directory (recursively)
+files=$(/usr/bin/find debian/ -type f \
+ -not -regex "debian/patche[sd]/.*" \
+ -not -regex "debian/\(control\|changelog\|rules\|watch\|copyright\)" \
+ -not -regex "debian/plugin-template/.*")
+if [ "$files" ]; then
+ for f in $files; do
+ /bin/chmod +w "$f"
+ /bin/cp -a -f "$f" "$tmp_file"
+ /bin/sed -e "$deb_subst" "$f" >"$tmp_file"
+ if ! /usr/bin/cmp -s "$f" "$tmp_file"; then
+ /usr/bin/touch -r "$f" "$tmp_file"
+ /bin/mv -f "$tmp_file" "$f"
+ echo "vdr pathes substituted in $f"
+ fi
+ done
+fi
+
+# Rename files in debian directory (recursively)
+files=$(/usr/bin/find debian/ -type f \
+ -name "*vdr*" -not -regex "debian/patche[sd]/.*")
+if [ "$files" ]; then
+ for f in $files; do
+ n=$(echo "$f" | /bin/sed -e "$deb_subst")
+ if [ "$f" != "$n" ]; then
+ /bin/mv "$f" "$n"
+ echo "renamed $f to $n"
+ fi
+ done
+fi
+
+# Remove tempfile
+/bin/rm -f "$tmp_file"
+
+exit 0
Added: vdr/vdr-plugin-osdtest256/trunk/debian/rules
===================================================================
--- vdr/vdr-plugin-osdtest256/trunk/debian/rules 2005-12-18 23:21:13 UTC (rev 1651)
+++ vdr/vdr-plugin-osdtest256/trunk/debian/rules 2005-12-18 23:21:28 UTC (rev 1652)
@@ -0,0 +1,97 @@
+#!/usr/bin/make -f
+# Sample debian/rules that uses debhelper.
+# GNU copyright 1997 to 1999 by Joey Hess.
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
+ CFLAGS += -g
+endif
+ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
+ INSTALL_PROGRAM += -s
+endif
+
+# Set VDR=vdr or VDR=vdrdevel - vdrdevel always uses dpatch
+VDR=$(shell dh_listpackages | grep "^vdr.*-" | head -n 1 | sed -e "s/-.*//")
+ifeq ($(VDR), vdrdevel)
+ DPATCH=yes
+endif
+
+# To use dpatch uncomment the following line and set Build-Depends to dpatch
+DPATCH=yes
+
+ifdef DPATCH
+include /usr/share/dpatch/dpatch.make
+else
+patch:
+patch-stamp:
+unpatch:
+endif
+
+configure: configure-stamp
+configure-stamp: patch-stamp
+ dh_testdir
+ touch configure-stamp
+
+build: build-stamp
+build-stamp: configure-stamp
+ dh_testdir
+ $(MAKE) all DVBDIR=/usr VDRDIR=/usr/include/$(VDR) LIBDIR=.
+ touch build-stamp
+
+clean: clean-patched unpatch
+clean-patched:
+ dh_testdir
+ dh_testroot
+ rm -f build-stamp configure-stamp
+ -$(MAKE) -o .dependencies clean
+ rm -f libvdr-*.so.*
+ dh_clean
+
+install: build
+ dh_testdir
+ dh_testroot
+ dh_clean -k
+ dh_installdirs
+ dh_install
+
+# Build architecture-independent files here.
+binary-indep: build install
+# We have nothing to do by default.
+
+# Build architecture-dependent files here.
+binary-arch: build install
+ dh_testdir
+ dh_testroot
+# dh_installdebconf
+ dh_installdocs
+ dh_installexamples
+# dh_installmenu
+# dh_installlogrotate
+# dh_installemacsen
+# dh_installpam
+# dh_installmime
+# dh_installinit
+# dh_installcron
+# dh_installman
+# dh_installinfo
+# dh_undocumented
+ dh_installchangelogs HISTORY
+ dh_link
+ dh_strip
+ dh_compress
+ dh_fixperms
+# dh_makeshlibs
+ dh_installdeb
+# dh_perl
+ dh_shlibdeps
+ /usr/lib/$(VDR)-dev/patchlevel.sh subst
+ /usr/lib/$(VDR)-dev/dependencies.sh
+ dh_gencontrol
+ dh_md5sums
+ dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install configure \
+ clean-patched patch unpatch
Property changes on: vdr/vdr-plugin-osdtest256/trunk/debian/rules
___________________________________________________________________
Name: svn:executable
+ *
Added: vdr/vdr-plugin-osdtest256/trunk/debian/watch
===================================================================
--- vdr/vdr-plugin-osdtest256/trunk/debian/watch 2005-12-18 23:21:13 UTC (rev 1651)
+++ vdr/vdr-plugin-osdtest256/trunk/debian/watch 2005-12-18 23:21:28 UTC (rev 1652)
@@ -0,0 +1,2 @@
+version=2
+http://www.escape-edv.de/endriss/vdr/vdr-osdtest256-(.*).tgz
More information about the pkg-vdr-dvb-changes
mailing list