summaryrefslogtreecommitdiff
blob: 226a8868a66c2ff539dc592b04ee4d46e3e29717 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
--- control-image.c	2005-10-29 21:36:43.000000000 +0200
+++ control-image-gentoo.c	2006-01-03 15:12:21.803187500 +0100
@@ -622,7 +622,7 @@
       return osContinue;
       
     // Load additional Commands
-    pCmd->Load(AddDirectory(cPlugin::ConfigDirectory(g_szConfigDirectory), "imagecmds.conf"));
+    pCmd->Load(AddDirectory(cPlugin::ConfigDirectory(g_szConfigDirectory), "image/imagecmds.conf"));
   
     if(pCmd->Count() <= 0)  {
       delete pCmd;
--- image.c	2005-10-29 21:50:31.000000000 +0200
+++ image-gentoo.c	2006-01-03 15:34:01.632421750 +0100
@@ -107,7 +107,7 @@
     return false;
   }
 
-  ImageSources.Load(AddDirectory(ConfigDirectory(g_szConfigDirectory),  "imagesources.conf"));
+  ImageSources.Load(AddDirectory(ConfigDirectory(g_szConfigDirectory),  "image/imagesources.conf"));
   if(ImageSources.Count()<1) {
     esyslog("imageplugin: you must have defined at least one source in imagesources.conf");
     return false;
--- libimage/Makefile.orig	2005-09-11 17:51:12.000000000 +0200
+++ libimage/Makefile	2006-01-03 15:36:56.307338250 +0100
@@ -3,19 +3,19 @@
 #
 # $Id: vdr-image-0.2.4-gentoo.diff,v 1.1 2006/01/04 17:03:52 hd_brummy Exp $
 
-VDRDIR = ../../../..
+VDRDIR = /usr/include
 
 ### The C++ compiler and options:
 
 CXX      ?= g++
-CXXFLAGS ?= -O0 -g -Wall -Woverloaded-virtual
+#CXXFLAGS ?= -O0 -g -Wall -Woverloaded-virtual
 
--include $(VDRDIR)/Make.config
+-include $(VDRDIR)/vdr/Make.config
 
 ### The directory environment:
 
 
-INCLUDES += -I$(VDRDIR)/include 
+INCLUDES += -I$(VDRDIR) 
 
 DEFINES  += -D_GNU_SOURCE
 
--- liboutput/Makefile.orig	2005-10-22 11:49:03.000000000 +0200
+++ liboutput/Makefile	2006-01-03 15:36:56.299337750 +0100
@@ -3,21 +3,21 @@
 #
 # $Id: vdr-image-0.2.4-gentoo.diff,v 1.1 2006/01/04 17:03:52 hd_brummy Exp $
 
-VDRDIR = ../../../..
-DVBDIR = ../../../../../DVB
+VDRDIR = /usr/include
+DVBDIR = /usr/include
 #FFMDIR = ../../../../../ffmpeg
 
 ### The C++ compiler and options:
 
 CXX      ?= g++
-CXXFLAGS ?= -O0 -g -Wall -Woverloaded-virtual
+#CXXFLAGS ?= -O0 -g -Wall -Woverloaded-virtual
 
--include $(VDRDIR)/Make.config
+-include $(VDRDIR)/vdr/Make.config
 
 ### The directory environment:
 
 
-INCLUDES += -I$(VDRDIR)/include -I.
+INCLUDES += -I$(VDRDIR) -I.
 ifdef FFMDIR
 INCLUDES += -I$(FFMDIR)/libavcodec -I$(FFMDIR)/libavutil
 endif

--- examples/imagecmds.conf.DE	2005-09-11 17:51:12.000000000 +0200
+++ examples/imagecmds-gentoo.conf.DE	2006-01-04 13:39:57.836373750 +0100
@@ -11,6 +11,6 @@
 Informationen �ber das Bild                              : identify -verbose
 Gr��e des Bildes                                         : du -chs %s
 Exif Informationen des JPEG-Bildes ausgeben              : jpegtopnm -dumpexif %s >/dev/null 2> $CONVERT_TEMPDIR/exif.tmp && cat $CONVERT_TEMPDIR/exif.tmp && rm -f $CONVERT_TEMPDIR/exif.tmp
-Rotatiere JPEG Bildes verlustlos um 90� nach Rechts      : jpegtran -rotate 90 %s > $CONVERT_TEMPDIR/tmp.jpg && mv $CONVERT_TEMPDIR/tmp.jpg %s
-Rotatiere JPEG Bildes verlustlos um 90� nach Links       : jpegtran -rotate 270 %s > $CONVERT_TEMPDIR/tmp.jpg && mv $CONVERT_TEMPDIR/tmp.jpg %s
+Rotiere JPEG Bildes verlustlos um 90� nach Rechts      : jpegtran -rotate 90 %s > $CONVERT_TEMPDIR/tmp.jpg && mv $CONVERT_TEMPDIR/tmp.jpg %s
+Rotiere JPEG Bildes verlustlos um 90� nach Links       : jpegtran -rotate 270 %s > $CONVERT_TEMPDIR/tmp.jpg && mv $CONVERT_TEMPDIR/tmp.jpg %s
 L�sche Bild                                             ?: rm -f %s