Update to 1.0.26, compensate for ffmpeg-1.x headers instead of using a patch

1 files changed, 31 insertions, 9 deletions

diff --git a/minidlna/build/minidlna.SlackBuild b/minidlna/build/minidlna.SlackBuild
index 0c5470f3..1060c556 100755
--- a/minidlna/build/minidlna.SlackBuild
+++ b/minidlna/build/minidlna.SlackBuild
@@ -37,7 +37,7 @@
 #                seems to stagnate.
 # 1.0.21-1:    11/aug/2011 by Eric Hameleers <alien@slackware.com>
 #              * Update.
-# 1.0.25-1:    20/jun/2013 by Eric Hameleers <alien@slackware.com>
+# 1.0.26-1:    20/jun/2013 by Eric Hameleers <alien@slackware.com>
 #              * Update.
 # 
 # Run 'sh minidlna.SlackBuild' to build a Slackware package.
@@ -47,7 +47,7 @@
 # -----------------------------------------------------------------------------
 
 PRGNAM=minidlna
-VERSION=${VERSION:-1.0.25}
+VERSION=${VERSION:-1.0.26}
 #VERSION=${VERSION:-HEAD}
 [ "$VERSION" = "HEAD"  ] && SRCVER=$(date +%Y%m%d) || SRCVER=$VERSION
 BUILD=${BUILD:-1}
@@ -64,9 +64,9 @@ TMP=${TMP:-/tmp/build}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-SOURCE[0]="$SRCDIR/${PRGNAM}_${SRCVER}_src.tar.gz"
+SOURCE[0]="$SRCDIR/${PRGNAM}-${SRCVER}.tar.gz"
 if [ "$VERSION" != "HEAD" ]; then
-  SRCURL[0]="http://sourceforge.net/projects/${PRGNAM}/files/${PRGNAM}/${SRCVER}/${PRGNAM}_${SRCVER}_src.tar.gz/download"
+  SRCURL[0]="http://sourceforge.net/projects/${PRGNAM}/files/${PRGNAM}/${SRCVER}/${PRGNAM}-${SRCVER}.tar.gz/download"
 else
   SRCURL[0]=""
 fi
@@ -208,10 +208,6 @@ for (( i = 0; i < ${#SOURCE[*]}; i++ )) ; do
 done
 cd ${PRGNAM} || cd ${PRGNAM}*
 
-# Needs a patch to compile against ffmpeg-1.x:
-cat $SRCDIR/minidlna_1.0.25_ffmpeg-1.patch | patch -p1 --verbose \
-  2>&1 | tee $OUTPUT/patch-${PRGNAM}.log
-
 chown -R root:root .
 chmod -R u+w,go+r-w,a+X-s .
 
@@ -219,12 +215,38 @@ echo Building ...
 export LDFLAGS="$SLKLDFLAGS"
 export CXXFLAGS="$SLKCFLAGS"
 export CFLAGS="$SLKCFLAGS"
+# More tweaks:
 sed -i \
-  -e "s/-O3 /${SLKCFLAGS} /" \
+  -e "s#-O3 #${SLKCFLAGS} -I/usr/include/ffmpeg/#" \
   -e '/^minidlna/s/ *$(LIBS)//' \
   Makefile
 make PREFIX=/usr 2>&1 | tee $OUTPUT/make-${PRGNAM}.log
+
+# Build language catalogs :
+( cd po
+  for catsrc in *.po; do
+    lang="${catsrc%.po}"
+    msgfmt -o "$lang.mo" "$catsrc"
+  done
+)
+
+# Install the lot:
 make DESTDIR=$PKG install 2>&1 | tee $OUTPUT/install-${PRGNAM}.log
+make DESTDIR=$PKG install-conf 2>&1 | tee -a $OUTPUT/install-${PRGNAM}.log
+
+# Install language catalogs:
+( cd po
+  for catalog in *.mo; do
+    lang="${catalog%.mo}"
+    install -d -m 0755 $PKG/usr/share/locale/${lang}/LC_MESSAGES
+    install -m 0644 $catalog $PKG/usr/share/locale/${lang}/LC_MESSAGES/minidlna.mo
+  done
+)
+
+# Create cache and log directories:
+mkdir -p $PKG/var/{cache,log}
+install -d -m 0755 $PKG/var/cache//${PRGNAM}/
+install -d -m 0755 $PKG/var/log/${PRGNAM}/
 
 # Do not clobber an existing configuration:
 mv $PKG/etc/minidlna.conf{,.new}