summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWolfgang Rohdewald <wolfgang@rohdewald.de>2009-06-05 10:40:36 +0200
committerWolfgang Rohdewald <wolfgang@rohdewald.de>2009-06-05 10:40:36 +0200
commit2565ad55f5712e9260e77b024622c0d0e23679cd (patch)
tree006236e547377910d75b9d10b284e9e82ff9ede7
parentcc8ba444863d3c0956bb9806031d95bc3fe3691b (diff)
downloadvdr-plugin-muggle-2565ad55f5712e9260e77b024622c0d0e23679cd.tar.gz
vdr-plugin-muggle-2565ad55f5712e9260e77b024622c0d0e23679cd.tar.bz2
add bashism patches posted by etobi, taken from the debian package.
Original comment: Just for the record, taken from the the Debian package, here are two tiny patches. One that removes an unnecessary bashism and one from TomJoad that allows compilation with VDR 1.7.7.
-rw-r--r--Makefile3
-rwxr-xr-xscripts/muggle-image-convert2
2 files changed, 4 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index ab4a6ab..7b73271 100644
--- a/Makefile
+++ b/Makefile
@@ -80,6 +80,9 @@ PACKAGE = vdr-$(ARCHIVE)
### Includes and Defines (add further entries here):
+FTWNOTWANTED = -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
+DEFINES := $(filter-out $(FTWNOTWANTED),$(DEFINES))
+
INCLUDES += -I$(VDRDIR) -I$(VDRDIR)/include \
$(shell taglib-config --cflags)
diff --git a/scripts/muggle-image-convert b/scripts/muggle-image-convert
index 5e7de95..2a62630 100755
--- a/scripts/muggle-image-convert
+++ b/scripts/muggle-image-convert
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
#
# requires: *topnm, pnmpad, pnmscale, ppmntsc, ppmtoy4m, mpeg2enc,
# mktemp, awk, file