diff options
| -rw-r--r-- | multimedia/xvst/README | 3 | ||||
| -rw-r--r-- | multimedia/xvst/patches/disable_update.patch | 8 | ||||
| -rw-r--r-- | multimedia/xvst/patches/screen_yahoo.patch | 86 | ||||
| -rw-r--r-- | multimedia/xvst/patches/wat.tv.patch | 97 | ||||
| -rw-r--r-- | multimedia/xvst/xvst.SlackBuild | 10 | ||||
| -rw-r--r-- | multimedia/xvst/xvst.info | 6 |
6 files changed, 12 insertions, 198 deletions
diff --git a/multimedia/xvst/README b/multimedia/xvst/README index 38355325d0..9b74f3a850 100644 --- a/multimedia/xvst/README +++ b/multimedia/xvst/README @@ -3,5 +3,4 @@ clips from a lot of video websites. xVideoServiceThief also provide you the ability to convert each video in most popular formats: AVI, MPEG1, MPEG2, WMV, MP4, 3GP, MP3 file formats. -xvst can also use flvstreamer (not available on SBo) as an optional -dependency. +xvst can also use flvstreamer as an optional dependency. diff --git a/multimedia/xvst/patches/disable_update.patch b/multimedia/xvst/patches/disable_update.patch index 2ae5ed743d..999db951b0 100644 --- a/multimedia/xvst/patches/disable_update.patch +++ b/multimedia/xvst/patches/disable_update.patch @@ -1,9 +1,9 @@ The update will not work anyway. -Index: xvst-2.5/src/options.cpp +Index: xvst-2.5.1/src/options.cpp =================================================================== ---- xvst-2.5.orig/src/options.cpp 2013-05-26 23:50:04.203059123 +0200 -+++ xvst-2.5/src/options.cpp 2013-05-26 23:50:04.199059123 +0200 -@@ -349,9 +349,9 @@ +--- xvst-2.5.1.orig/src/options.cpp 2014-01-10 20:22:19.441638438 +0100 ++++ xvst-2.5.1/src/options.cpp 2014-01-10 20:22:19.437638438 +0100 +@@ -355,9 +355,9 @@ languageFile = LanguageManager::getDefaultUserLanguage(getLanguagesPath()); // "english_uk.language"; diff --git a/multimedia/xvst/patches/screen_yahoo.patch b/multimedia/xvst/patches/screen_yahoo.patch deleted file mode 100644 index 2db869e200..0000000000 --- a/multimedia/xvst/patches/screen_yahoo.patch +++ /dev/null @@ -1,86 +0,0 @@ -# new version -Index: xvst-2.5/resources/services/yahoovideo/yahoovideo.js -=================================================================== ---- xvst-2.5.orig/resources/services/yahoovideo/yahoovideo.js 2013-02-25 19:37:11.000000000 +0100 -+++ xvst-2.5/resources/services/yahoovideo/yahoovideo.js 2013-09-09 18:48:45.076024563 +0200 -@@ -25,11 +25,11 @@ - - function RegistVideoService() - { -- this.version = "1.0.0"; -+ this.version = "1.1.0"; - this.minVersion = "2.0.0a"; -- this.author = "Xesc & Technology 2009"; -- this.website = "http://video.yahoo.com/"; -- this.ID = "video.yahoo.com"; -+ this.author = "anon"; -+ this.website = "http://screen.yahoo.com/"; -+ this.ID = "screen.yahoo.com"; - this.caption = "Yahoo Video"; - this.adultContent = false; - this.musicSite = false; -@@ -37,30 +37,46 @@ - - function getVideoInformation(url) - { -- const URL_GET_XML = "http://cosmos.bcst.yahoo.com/up/yep/process/getPlaylistFOP.php?node_id=%1&tech=flash&mode=playlist&bitrate=300&null&rd=video.yahoo.com&tk=null"; -+ var url_get_json ="http://video.query.yahoo.com/v1/public/yql?q=SELECT streams FROM yahoo.media.video.streams WHERE id=\"%1\" AND plrs=\"\" AND protocol=\"http\" AND region=\"%2\";&env=prod&format=json"; - // init result - var result = new VideoDefinition(); - // download webpage - var http = new Http(); - var html = http.downloadWebpage(url); - // get video title -- result.title = copyBetween(html, "<meta name=\"title\" content=\"", "\""); -- // if we didn't get a title, try to get the channel video title -- if (result.title == "") -- result.title = copyBetween(html, "<h2 id=\"nvi_title\">", "</h2>"); -+ var title = copyBetween(html, "<title>", "</title>"); -+ //if we have the ?format=embed parameter added, the | is missing -+ if (title.toString().indexOf(" |") != -1) -+ title = copyBetween(title, "", " |"); -+ result.title = title; - // get the node_id -- var node_id = copyBetween(html, "so.addVariable(\"id\", \"", "\""); -- // download xml -- var xml = http.downloadWebpage(strFormat(URL_GET_XML, node_id)); -+ var node_id = copyBetween(html, "\"id\":\"", "\""); -+ // get the region -+ var region = copyBetween(html, "region: \'", "\'"); -+ // download json -+ var jsonstr = http.downloadWebpage(strFormat(url_get_json, node_id, region)); -+ var json = JSON.parse(jsonstr); -+ var streams = json.query.results.mediaObj[0].streams; -+ var streamindex = streams.length - 1; //the streams are sorted by quality. highest is last. - // get video host and path -- var host = copyBetween(xml, "<STREAM APP=\"", "\""); -- var path = copyBetween(xml, "FULLPATH=\"", "\""); -+ var host = streams[streamindex].host; //copyBetween(json, "\"host\":\"", "\""); -+ var path = streams[streamindex].path; //copyBetween(json, "\"path\":\"", "\"") - // set video URL -- result.URL = strReplace(host + path, "&", "&"); -+ result.URL = host + path; //take the video with highest quality -+ result.extension = extensionFromVideoType(streams[streamindex].mime_type); - // return the video information - return result; - } - -+function extensionFromVideoType(vtype) -+{ -+ if (vtype == "video/x-flv") return ".flv"; -+ if (vtype == "video/mp4") return ".mp4"; -+ if (vtype == "video/webm") return ".webm"; -+ // default extension -+ return ".flv"; -+} -+ - function getVideoServiceIcon() - { - return new Array( -@@ -72,4 +88,4 @@ - 0x30,0xec,0x01,0xc4,0xcb,0x70,0x47,0x10,0x2e,0x33,0x20,0x5b,0xb2,0xbd,0x58,0x9c, - 0xfa,0x5b,0x0d,0x9a,0xe5,0x10,0xb3,0x3f,0x33,0x07,0xa6,0xb3,0x7e,0x82,0xcd,0x2f, - 0x11,0x53,0x00,0x00,0x00,0x00,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82); --} -+} -\ No newline at end of file diff --git a/multimedia/xvst/patches/wat.tv.patch b/multimedia/xvst/patches/wat.tv.patch deleted file mode 100644 index 67eca10b9f..0000000000 --- a/multimedia/xvst/patches/wat.tv.patch +++ /dev/null @@ -1,97 +0,0 @@ -# New plugin version -Index: xvst-2.5/resources/services/wat/wat.js -=================================================================== ---- xvst-2.5.orig/resources/services/wat/wat.js 2013-02-25 19:37:11.758387000 +0100 -+++ xvst-2.5/resources/services/wat/wat.js 2013-05-27 01:03:49.342927487 +0200 -@@ -3,7 +3,7 @@ - * This file is part of xVideoServiceThief, - * an open-source cross-platform Video service download - * --* Copyright (C) 2007 - 2011 Xesc & Technology -+* Copyright (C) 2007 - 2009 Xesc & Technology - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by -@@ -25,9 +25,9 @@ - - function RegistVideoService() - { -- this.version = "1.0.4"; -+ this.version = "1.0.2"; - this.minVersion = "2.0.0a"; -- this.author = "Xesc & Technology 2011"; -+ this.author = "Xesc & Technology 2009"; - this.website = "http://www.wat.tv/"; - this.ID = "wat.tv"; - this.caption = "Wat.tv"; -@@ -45,7 +45,7 @@ - var http = new Http(); - var html = http.downloadWebpage(url); - // get video title -- result.title = copyBetween(html, "'title" content="', '"'); -+ result.title = copyBetween(html, "<h2 class=\"title\">", "</h2>"); - // get video id - var vidId = copyBetween(html, 'id="media" value="', '"'); - // download video info -@@ -61,17 +61,48 @@ - { - return new Array( - 0x89,0x50,0x4e,0x47,0x0d,0x0a,0x1a,0x0a,0x00,0x00,0x00,0x0d,0x49,0x48,0x44,0x52, -- 0x00,0x00,0x00,0x10,0x00,0x00,0x00,0x10,0x08,0x03,0x00,0x00,0x00,0x28,0x2d,0x0f, -- 0x53,0x00,0x00,0x00,0x2a,0x50,0x4c,0x54,0x45,0xff,0xff,0xfd,0xff,0xc4,0xf6,0xff, -- 0x66,0xe2,0xff,0x86,0xea,0xff,0xec,0xfc,0xff,0x57,0xe2,0xff,0x00,0xcf,0xff,0xad, -- 0xef,0xff,0xfd,0xff,0xff,0x2c,0xd5,0xff,0x98,0xec,0xff,0x42,0xdb,0xff,0x76,0xe6, -- 0xff,0xd8,0xf6,0x42,0x91,0xbf,0xbc,0x00,0x00,0x00,0x69,0x49,0x44,0x41,0x54,0x78, -- 0xda,0x9d,0x8d,0xdb,0x0e,0xc0,0x20,0x08,0x43,0x51,0x2e,0x82,0xba,0xff,0xff,0xdd, -- 0x15,0xe2,0xb2,0x3d,0xaf,0x90,0xa6,0x1c,0x9b,0x48,0x3f,0xd4,0x3a,0xcb,0x93,0x85, -- 0x7b,0x23,0x35,0x1b,0xc8,0xee,0xb0,0x61,0xa6,0x00,0x01,0x20,0xbd,0x4b,0x81,0x38, -- 0x8d,0x69,0xc6,0x07,0xac,0x04,0xbe,0x0f,0x88,0x95,0x8d,0x4d,0x0e,0x57,0x27,0x86, -- 0x67,0xcd,0x26,0x12,0x2a,0x33,0x23,0x49,0xd8,0x57,0x42,0xd4,0x8a,0x84,0x96,0x8f, -- 0xfc,0xfd,0xda,0xb1,0x58,0x84,0x35,0x76,0xc3,0xe9,0x98,0xaf,0xde,0xf3,0x25,0x10, -- 0xd5,0xd6,0xdb,0x0d,0x8b,0x51,0x03,0x7a,0x88,0x11,0x0f,0x52,0x00,0x00,0x00,0x00, -- 0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82); -+ 0x00,0x00,0x00,0x10,0x00,0x00,0x00,0x10,0x08,0x02,0x00,0x00,0x00,0x90,0x91,0x68, -+ 0x36,0x00,0x00,0x01,0x2f,0x69,0x43,0x43,0x50,0x49,0x43,0x43,0x20,0x50,0x72,0x6f, -+ 0x66,0x69,0x6c,0x65,0x00,0x00,0x78,0x01,0x63,0x60,0x60,0x32,0x70,0x74,0x71,0x72, -+ 0x65,0x12,0x60,0x60,0xc8,0xcd,0x2b,0x29,0x0a,0x72,0x77,0x52,0x88,0x88,0x8c,0x52, -+ 0x60,0xbf,0xc0,0xc0,0xc1,0xc0,0xcd,0x20,0xcc,0x60,0xcc,0x60,0x9d,0x98,0x5c,0x5c, -+ 0xe0,0x18,0x10,0xe0,0xc3,0x00,0x04,0x79,0xf9,0x79,0xa9,0x20,0x1a,0x15,0x7c,0xbb, -+ 0xc6,0xc0,0x08,0x12,0xb9,0xac,0x0b,0x32,0x0b,0x55,0x8e,0x20,0x8f,0x2b,0xb9,0xa0, -+ 0xa8,0x04,0xa8,0xea,0x0f,0x10,0x1b,0xa5,0xa4,0x16,0x27,0x33,0x30,0x30,0x1a,0x00, -+ 0xd9,0xd9,0xe5,0x25,0x05,0x40,0x71,0xc6,0x39,0x40,0xb6,0x48,0x52,0x36,0x98,0xbd, -+ 0x01,0xc4,0x2e,0x0a,0x09,0x72,0x06,0x8a,0x1f,0x01,0xb2,0xf9,0xd2,0x21,0xec,0x2b, -+ 0x20,0x76,0x12,0x84,0xfd,0x04,0xc4,0x2e,0x02,0x7a,0x02,0xa8,0xe6,0x0b,0x48,0x7d, -+ 0x3a,0x98,0xcd,0xc4,0x01,0x62,0x27,0x41,0xd8,0x32,0x20,0x76,0x49,0x6a,0x05,0xc8, -+ 0x5e,0x06,0xe7,0xfc,0x82,0xca,0xa2,0xcc,0xf4,0x8c,0x12,0x05,0x23,0x03,0x03,0x03, -+ 0x05,0xc7,0x94,0xfc,0xa4,0x54,0x85,0xe0,0xca,0xe2,0x92,0xd4,0xdc,0x62,0x05,0xcf, -+ 0xbc,0xe4,0xfc,0xa2,0x82,0xfc,0xa2,0xc4,0x92,0xd4,0x14,0xa0,0x5a,0x88,0xfb,0x40, -+ 0xba,0x18,0x04,0x21,0x0a,0x41,0x21,0xa6,0x61,0x68,0x69,0x69,0xa1,0x09,0x16,0xa5, -+ 0x22,0x01,0x8a,0x07,0x88,0x71,0x9f,0x03,0xc1,0xe1,0xcb,0x28,0x76,0x06,0x21,0x86, -+ 0xb0,0x28,0xb9,0xb4,0xa8,0x0c,0xca,0x63,0x64,0x32,0x66,0x60,0x20,0xc4,0x47,0x98, -+ 0x31,0x47,0x82,0x81,0xc1,0x7f,0x29,0x03,0x03,0xcb,0x1f,0x84,0x98,0x49,0x2f,0x03, -+ 0xc3,0x02,0x1d,0x06,0x06,0xfe,0xa9,0x08,0x31,0x35,0x43,0x06,0x06,0x01,0x7d,0x06, -+ 0x86,0x7d,0x73,0x00,0xc3,0xaf,0x50,0x6f,0xe6,0xb3,0xe5,0xe9,0x00,0x00,0x00,0x09, -+ 0x70,0x48,0x59,0x73,0x00,0x00,0x0b,0x13,0x00,0x00,0x0b,0x13,0x01,0x00,0x9a,0x9c, -+ 0x18,0x00,0x00,0x01,0x3c,0x49,0x44,0x41,0x54,0x28,0x15,0x63,0xfc,0xff,0xff,0x2f, -+ 0x03,0x29,0x80,0x89,0x14,0xc5,0x20,0xb5,0x24,0x6b,0x60,0x61,0x38,0xfa,0x93,0x61, -+ 0xd1,0x1b,0x06,0x05,0x0e,0x86,0x34,0x21,0x06,0x61,0x46,0xec,0x16,0xbe,0xfd,0xcf, -+ 0x30,0xeb,0x1d,0xc3,0x83,0x1f,0x0c,0x71,0x22,0x2c,0x0c,0x93,0xdf,0x30,0xac,0x7c, -+ 0x0b,0x52,0xa7,0xce,0xca,0x10,0xc4,0x07,0xd5,0xf0,0x0f,0x6c,0x33,0xd3,0x3f,0x28, -+ 0xf7,0xe0,0x67,0x86,0xaa,0xa7,0x20,0xf6,0x47,0xb8,0x93,0x74,0xd8,0xa0,0x72,0x40, -+ 0x0a,0x68,0x5e,0xe6,0x63,0x10,0x02,0x32,0xd0,0xc0,0xd5,0xcf,0x2c,0x50,0x91,0x2b, -+ 0xbf,0x10,0x52,0x6b,0x3e,0x30,0xcc,0x02,0xdb,0x09,0x74,0x67,0xa5,0x30,0x42,0x1c, -+ 0xcc,0x62,0x62,0x78,0xfd,0x13,0x45,0x08,0xe8,0x98,0x7b,0x48,0x9a,0x91,0xe5,0x80, -+ 0xae,0x10,0x63,0x63,0x62,0x10,0x65,0x87,0x0a,0x9e,0xfc,0x0e,0x65,0x3c,0xfc,0x03, -+ 0x65,0x5c,0xfc,0xc1,0x00,0xf1,0xcc,0xcd,0xdf,0x20,0x11,0xa0,0x2b,0x44,0xd9,0x59, -+ 0x18,0xc2,0x78,0xa1,0x9e,0xee,0x7a,0xc9,0xa0,0xc4,0xc6,0xf0,0xee,0x1f,0x94,0x0b, -+ 0x54,0x01,0x0c,0x0c,0x7d,0x0e,0x06,0x21,0x26,0xa8,0x8f,0x81,0x22,0x8e,0x5c,0x8c, -+ 0xff,0xdf,0xfc,0x61,0x70,0xb8,0x09,0xd2,0x4d,0x0c,0x78,0xa3,0xcb,0x04,0x0a,0xfb, -+ 0x19,0x8a,0x0c,0xc8,0xa1,0x04,0xd4,0x09,0xe4,0x86,0xa3,0x7a,0x17,0x28,0xb2,0x56, -+ 0x81,0x41,0x90,0x99,0x11,0x9a,0x96,0x6e,0xfe,0x64,0x98,0xf7,0x81,0x61,0xdb,0x7b, -+ 0xa0,0xb7,0x18,0x5c,0xf8,0x41,0x91,0x08,0x04,0xc0,0xc8,0x02,0x7a,0xe3,0xea,0x67, -+ 0x06,0x2f,0x41,0x06,0x3f,0x01,0x06,0x6b,0x90,0x6f,0x19,0xff,0xff,0xfd,0xcf,0x00, -+ 0x8c,0x20,0xa0,0xe7,0xe0,0xd1,0x04,0x52,0x8b,0x13,0xc0,0xd2,0x12,0x71,0xaa,0x81, -+ 0xc6,0xb0,0x40,0x8d,0x87,0x9b,0x08,0xb1,0x0d,0xc8,0x85,0x33,0x20,0x6c,0x98,0x02, -+ 0x00,0xf8,0xc9,0x65,0x0a,0x86,0x6f,0x02,0x27,0x00,0x00,0x00,0x00,0x49,0x45,0x4e, -+ 0x44,0xae,0x42,0x60,0x82); - } diff --git a/multimedia/xvst/xvst.SlackBuild b/multimedia/xvst/xvst.SlackBuild index 033ca69467..f56cf6fff9 100644 --- a/multimedia/xvst/xvst.SlackBuild +++ b/multimedia/xvst/xvst.SlackBuild @@ -24,7 +24,7 @@ PRGNAM=xvst SRCNAM=xVideoServiceThief -VERSION=${VERSION:-2.5} +VERSION=${VERSION:-2.5.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -57,12 +57,12 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $SRCNAM-$VERSION -tar -xvf $CWD/$SRCNAM-2.5.tar.gz || tar -xvf $CWD/$VERSION.tar.gz +tar xvf $CWD/$SRCNAM-$VERSION.tar.gz || tar xvf $CWD/$VERSION.tar.gz cd $SRCNAM-$VERSION chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ + -o -perm 511 \) -exec chmod 755 {} \; -o \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; @@ -101,9 +101,7 @@ install -m 0644 resources/images/InformationLogo.png \ $PKG/usr/share/pixmaps/$PRGNAM.png mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a \ - *.txt resources/changelog.txt \ - $PKG/usr/doc/$PRGNAM-$VERSION +cp -a *.txt resources/changelog.txt $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/multimedia/xvst/xvst.info b/multimedia/xvst/xvst.info index b93f2c9445..b8e880a1a2 100644 --- a/multimedia/xvst/xvst.info +++ b/multimedia/xvst/xvst.info @@ -1,8 +1,8 @@ PRGNAM="xvst" -VERSION="2.5" +VERSION="2.5.1" HOMEPAGE="http://xviservicethief.sourceforge.net/" -DOWNLOAD="https://github.com/xVST/xVideoServiceThief/archive/2.5.tar.gz" -MD5SUM="a878b0fd26f3a0254ac34efe62a5bbdc" +DOWNLOAD="https://github.com/xVST/xVideoServiceThief/archive/2.5.1.tar.gz" +MD5SUM="917d32b75585eec0e0ff5245253f33ed" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="%README% ffmpeg qt5" |