summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'media-plugins/vdr-alcd/files')
-rw-r--r--media-plugins/vdr-alcd/files/vdr-alcd-1.5.1-gcc-4.4.diff22
-rw-r--r--media-plugins/vdr-alcd/files/vdr-alcd-1.5.1-makefile-cleanup.diff44
2 files changed, 0 insertions, 66 deletions
diff --git a/media-plugins/vdr-alcd/files/vdr-alcd-1.5.1-gcc-4.4.diff b/media-plugins/vdr-alcd/files/vdr-alcd-1.5.1-gcc-4.4.diff
deleted file mode 100644
index a4465220534a..000000000000
--- a/media-plugins/vdr-alcd/files/vdr-alcd-1.5.1-gcc-4.4.diff
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: alcd-1.5.1/thread.c
-===================================================================
---- alcd-1.5.1.orig/thread.c
-+++ alcd-1.5.1/thread.c
-@@ -104,7 +104,7 @@ void cLCD::SetText( const char *szText )
- // only proceed, if valid data
- if( szText != NULL && strlen( szText ) > 0 ) {
- // set channel name
-- char *delim = strchr( szText, '|' );
-+ const char *delim = strchr( szText, '|' );
- if( delim ) {
- char buffer[ BUFSIZE ];
- int sLen = ( delim - szText ) >= BUFSIZE ? BUFSIZE : ( delim - szText );
-@@ -420,7 +420,7 @@ void cLCD::Replaying( const cControl *co
- if( szFileName[i] == ')' )
- strncpy( (char *)szReplayMode, szFileName + 8, i - 8 );
- }
-- char *p = strstr( szFileName + i, " : " );
-+ const char *p = strstr( szFileName + i, " : " );
- if( p )
- strncpy( szTemp, p + 3, sizeof(szTemp ));
- else
diff --git a/media-plugins/vdr-alcd/files/vdr-alcd-1.5.1-makefile-cleanup.diff b/media-plugins/vdr-alcd/files/vdr-alcd-1.5.1-makefile-cleanup.diff
deleted file mode 100644
index ea1488e40b0f..000000000000
--- a/media-plugins/vdr-alcd/files/vdr-alcd-1.5.1-makefile-cleanup.diff
+++ /dev/null
@@ -1,44 +0,0 @@
-Index: alcd-1.5.1/Makefile
-===================================================================
---- alcd-1.5.1.orig/Makefile
-+++ alcd-1.5.1/Makefile
-@@ -23,8 +23,8 @@ VDRINC = $(VDRDIR)/include
- LIBDIR = ../../lib
- TMPDIR = /tmp
-
--CXX = g++
--CXXFLAGS = -O2 -Wall -Woverloaded-virtual -D_GNU_SOURCE
-+CXX ?= g++
-+CXXFLAGS ?= -fPIC -O2 -Wall -Woverloaded-virtual
-
- -include $(VDRDIR)/Make.config
-
-@@ -41,6 +41,8 @@ PACKAGE = vdr-$(ARCHIVE)
-
- INCLUDES = -I$(VDRDIR)/include
-
-+DEFINES += -D_GNU_SOURCE
-+
- ### Allow user defined options to overwrite defaults:
-
- DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
-@@ -53,6 +55,10 @@ endif
-
- OBJS = $(PLUGIN).o lcd.o thread.o setup.o
-
-+### The main target:
-+
-+all: libvdr-$(PLUGIN).so i18n
-+
- ### Target directory for afp-tool binary
-
- PREFIX = /usr
-@@ -100,8 +106,6 @@ i18n: $(I18Nmsgs)
-
- ### Targets:
-
--all: libvdr-$(PLUGIN).so i18n
--
- libvdr-$(PLUGIN).so: $(OBJS)
- $(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@
- @cp $@ $(LIBDIR)/$@.$(APIVERSION)