kissdx: update to r193 (#11147)

SVN-Revision: 33037

diff --git a/multimedia/kissdx/Makefile b/multimedia/kissdx/Makefile
index dbd94ecd42ecb16341e9e7b1b58418d5f390b3f5..1b787db016d25cf131f49774e3e833465f068a5d 100644 (file)
--- a/multimedia/kissdx/Makefile
+++ b/multimedia/kissdx/Makefile
@@ -8,14 +8,18 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=kissdx
-PKG_VERSION:=0.14.0.b1a
-PKG_RELEASE:=9
+PKG_REV:=193
+PKG_VERSION:=r$(PKG_REV)
+PKG_RELEASE:=3
 
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).zip
-PKG_SOURCE_URL:=http://kissdx.vidartysse.net
-PKG_MD5SUM:=ef213d2748f5a63b1c97ac7bfa942b2f
+PKG_SOURCE_PROTO:=svn
+PKG_SOURCE_VERSION:=$(PKG_REV)
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+PKG_SOURCE_URL:=http://www.famille-kahn.com/svn/kissdx/kissdx/trunk
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_VERSION:=$(PKG_REV)
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_SOURCE_SUBDIR)
 
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/nls.mk
@@ -39,6 +43,7 @@ define Build/Compile
                CFLAGS="$(TARGET_CFLAGS) -DLinux -DUSE_INTERNAL_SENDFILE -std=gnu99 -Wall -Wstrict-prototypes -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -DFILE_OFFSET_BITS=64 -D_GNU_SOURCE -I$(ICONV_PREFIX)/include -I$(STAGING_DIR)/usr/include/dvdread $(TARGET_CPPFLAGS) $(TARGET_LDFLAGS) -L$(ICONV_PREFIX)/lib" \
                LDFLAGS="-L$(ICONV_PREFIX)/lib $(TARGET_LDFLAGS)" \
                STRIP=$(STRIP) \
+               IconvExternal=defined \
                CC="$(TARGET_CROSS)gcc" all
 endef
 

diff --git a/multimedia/kissdx/files/kissdx.config b/multimedia/kissdx/files/kissdx.config
index 5cce4267f53ec5a8a3bbc6cd03da8c59423c6132..5cd2b170e22fcf5798d459af8b9e83aa28f2bb4c 100644 (file)
--- a/multimedia/kissdx/files/kissdx.config
+++ b/multimedia/kissdx/files/kissdx.config
@@ -9,6 +9,7 @@ config 'kissdx' 'server'
        option 'enablehiddenfilesminutes' '5'
        option 'listhiddenentries' 'no'
        option 'displaysequencenumbers' 'no'
+       option 'loglevel' '4'
        
 config 'kissdx' 'paths'
        option 'audio' '/mnt/music'
@@ -20,6 +21,7 @@ config 'kissdx' 'files'
        option 'video' 'mpg,mpeg,vob,avi,wmv,ts,mp4,divx'
        option 'picture' 'jpg,jpeg,png,bmp'
        option 'iso' 'iso,img'
+       option 'renamefiletypes' 'ts:mpg,wav:mp3'
 
 config 'kissdx' 'subtitles'
        option 'filemapping' '*:{name}*.*'

diff --git a/multimedia/kissdx/files/kissdx.init b/multimedia/kissdx/files/kissdx.init
index 847be8191759e1af6b65951e0d7b2b7cef141edd..9f1a78e0f70df62e886dc16b4dced01a42a59483 100755 (executable)
--- a/multimedia/kissdx/files/kissdx.init
+++ b/multimedia/kissdx/files/kissdx.init
@@ -11,9 +11,9 @@ create_configfile() {
        local signature pidfile characterset \
                picturetargetwidth picturetargetheight picturemaxzoompercent \
                enablehiddenfilestext enablehiddenfilesminutes \
-               listhiddenentries displaysequencenumbers
+               listhiddenentries displaysequencenumbers loglevel
        local path_audio path_video path_picture
-       local files_audio files_video files_picture files_iso
+       local files_audio files_video files_picture files_iso files_renamefiletypes
        local subtitles_filemapping
        local recentfiles_foldername recentfiles_max
        local kml_forwardurl
@@ -32,6 +32,7 @@ create_configfile() {
        config_get enablehiddenfilesminutes server enablehiddenfilesminutes
        config_get listhiddenentries server listhiddenentries
        config_get displaysequencenumbers server displaysequencenumbers
+       config_get loglevel server loglevel
 
        config_get path_audio paths audio
        config_get path_video paths video
@@ -41,6 +42,7 @@ create_configfile() {
        config_get files_video files video
        config_get files_picture files picture
        config_get files_iso files iso
+       config_get files_renamefiletypes files renamefiletypes
 
        config_get subtitles_filemapping subtitles filemapping
 
@@ -55,7 +57,6 @@ create_configfile() {
        echo '#adminserver_port = 8003' >> $CFGFILE
        echo 'configautoload            = no' >> $CFGFILE
        echo '#dvdaccessmethod  = libdvdnav' >> $CFGFILE
-       echo '#renamefiletypes  = ts:mpg,wav:mp3' >> $CFGFILE
        echo 'pidfilepath               = ' $pidfile >> $CFGFILE
        echo '#persistentstoragepath    = /tmp/kissdx' >> $CFGFILE
        echo '#server_character_set     = CP850' >> $CFGFILE
@@ -77,6 +78,8 @@ create_configfile() {
        echo 'picturefileextensions     = ' $files_picture >> $CFGFILE
        echo 'isofileextensions = ' $files_iso >> $CFGFILE
        echo '' >> $CFGFILE
+       echo 'renamefiletypes = ' $files_renamefiletypes >> $CFGFILE
+       echo '' >> $CFGFILE
        echo 'listhiddenentries = ' $listhiddenentries >> $CFGFILE
        echo 'enablehiddenfilestext     = ' $enablehiddenfilestext >> $CFGFILE
        echo 'enablehiddenfilesminutes = ' $enablehiddenfilesminutes >> $CFGFILE
@@ -96,6 +99,9 @@ create_configfile() {
        echo '#posttrigger              = /usr/bin/kissd-posttrigger' >> $CFGFILE
        echo '#directorypretrigger      = /usr/bin/kissddirpretrigger' >> $CFGFILE
        echo '#directoryposttrigger     = /usr/bin/kisdddirposttrigger' >> $CFGFILE     
+       echo '#Set logging level (1 to 5). 5 means no log. Loglevel can also be' >> $CFGFILE
+       echo '#specified as one of: Error, Warning, Protocol, Information, Debug.' >> $CFGFILE
+       echo 'loglevel                  = ' $loglevel >> $CFGFILE
 }
 
 start () {

diff --git a/multimedia/kissdx/patches/001-cross_compile.patch b/multimedia/kissdx/patches/001-cross_compile.patch
deleted file mode 100644 (file)
index 55db9fc..0000000
--- a/multimedia/kissdx/patches/001-cross_compile.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -Naur kissdx-0.14.0.b1a.orig/Makefile kissdx-0.14.0.b1a/Makefile
---- kissdx-0.14.0.b1a.orig/Makefile    2007-10-24 00:13:33.000000000 +0300
-+++ kissdx-0.14.0.b1a/Makefile 2009-03-05 22:53:51.000000000 +0200
-@@ -27,9 +27,9 @@
- 
- kissdx: $(OBJS)
- # remove -liconv below if your system has libiconv built in
--      $(CC) -o $@ $(OBJS) -ldvdread -liconv -ljpeg -lm $(EXTRA_LIBS) 
-+      $(CC) -o $@ $(OBJS) -ldvdread -liconv -ljpeg -lm $(LDFLAGS) $(EXTRA_LIBS) 
- #     $(CC) -o $@ $(OBJS) -ldvdread -ljpeg -lm $(EXTRA_LIBS) 
--      strip kissdx.exe
-+      $(STRIP) kissdx
- 
- all: kissdx
-