rpms/staging-kmod/devel staging-kmod.spec,1.46,1.47
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/staging-kmod/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv9933
Modified Files:
staging-kmod.spec
Log Message:
Fix build for arm
Index: staging-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/staging-kmod/devel/staging-kmod.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- staging-kmod.spec 30 Mar 2015 13:36:45 -0000 1.46
+++ staging-kmod.spec 8 Apr 2015 10:06:20 -0000 1.47
@@ -17,7 +17,7 @@
Name: staging-kmod
Version: 3.19.2
-Release: %{?prever:0.}1%{?prever:.%{prever}}%{?dist}.2
+Release: %{?prever:0.}2%{?prever:.%{prever}}%{?dist}
Summary: Selected kernel modules from linux-staging
Group: System Environment/Kernel
@@ -46,8 +46,8 @@
# prepare
%setup -q -c -T -a 0
-# disable drivers that are enabled in Fedora's kernel, as those otherweise would get build
-sed -i '/.CRYSTALH/ d; /.FIREWIRE_SERIAL/ d; /.LIRC/ d; /.R8712U/ d; /.RTL8192E/ d; /.R8192EE/ d; /.R8723AU/ d; /.IMX/ d; /.DWC2/ d; /.VIDEO_TLG2300/ d;' $(find linux-staging-%{version}%{?prever:-%{prever}}/drivers/staging/ -name 'Makefile')
+# disable drivers that are enabled in Fedora's kernel or not yet relevant, as those otherweise would get build
+sed -i '/.COMMON_CLK_XLNX_CLKWZRD/ d; /.FIREWIRE_SERIAL/ d; /.LIRC/ d; /.MTD_SPINAND/ d; /.R8712U/ d; /.RTL8192E/ d; /.R8192EE/ d; /.R8723AU/ d; /.SENSORS_ISL29/ d; /.IMX/ d; /.DWC2/ d; /.VIDEO_TLG2300/ d; /.GS_FPGABOOT/ d;' $(find linux-staging-%{version}%{?prever:-%{prever}}/drivers/staging/ -name 'Makefile')
# broken in 3.13
sed -i 's!#include "dot11d.h"!#include "ieee80211/dot11d.h"!' linux-staging-%{version}/drivers/staging/rtl8192u/{r8192U_core.c,r8192U_wx.c,r819xU_phy.c}
@@ -129,11 +129,8 @@
rm -rf $RPM_BUILD_ROOT
%changelog
-* Mon Mar 30 2015 Nicolas Chauvet <kwizart(a)gmail.com> - 3.19.2-1.2
-- Rebuilt for kernel
-
-* Fri Mar 27 2015 Nicolas Chauvet <kwizart(a)gmail.com> - 3.19.2-1.1
-- Rebuilt for kernel
+* Wed Apr 8 2015 Nicolas Chauvet <kwizart(a)gmail.com> - 3.19.2-2
+- Update for ARM
* Tue Mar 24 2015 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 3.19.2-1
- Update to 3.19.2
9 years
rpms/akmods/F-20 akmods, 1.11, 1.12 akmods-shutdown.service, 1.1, 1.2 akmods.spec, 1.18, 1.19 akmodsbuild, 1.3, 1.4
by Sérgio M. Basto
Author: sergiomb
Update of /cvs/free/rpms/akmods/F-20
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv9727
Modified Files:
akmods akmods-shutdown.service akmods.spec akmodsbuild
Log Message:
* Wed Apr 4 2015 Richard Shaw <hobbes1069(a)gmail.com> - 0.5.2-1
- Fix temporary directory creation when TMPDIR environment variable is set,
fixes BZ#2596.
- Update systemd scripts to use macros.
- Fix akmods run on shutdown systemd unit file, fixes BZ#3503.
Index: akmods
===================================================================
RCS file: /cvs/free/rpms/akmods/F-20/akmods,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- akmods 20 Mar 2012 18:14:12 -0000 1.11
+++ akmods 8 Apr 2015 10:00:41 -0000 1.12
@@ -87,11 +87,11 @@
fi
# global logfile
- echo "$(date +%d\ %b\ %H:%M:%S) akmods: $@" >> "/var/cache/akmods/akmods.log"
+ echo "$(date +%Y/%m/%d\ %H:%M:%S) akmods: $@" >> "/var/cache/akmods/akmods.log"
# the kmods logfile as well, if we work on a kmod
if [[ "${kmodlogfile}" ]]; then
- echo "$(date +%d\ %b\ %H:%M:%S) akmods: $@" >> "${kmodlogfile}"
+ echo "$(date +%Y/%m/%d\ %H:%M:%S) akmods: $@" >> "${kmodlogfile}"
fi
}
@@ -109,7 +109,7 @@
create_tmpdir()
{
- if ! tmpdir="$(mktemp -d -t ${myprog}.XXXXXXXX)/" ; then
+ if ! tmpdir="$(mktemp -d -p /tmp ${myprog}.XXXXXXXX)/" ; then
akmods_echo 2 1 "ERROR: failed to create tmpdir."
akmods_echo 2 1 --failure; return 1
fi
@@ -252,7 +252,7 @@
# copy rpmbuild log to kmod specific logfile
if [[ -s "${tmpdir}"/akmodsbuild.log ]]; then
while read line ; do
- echo "$(date +%d\ %b\ %H:%M:%S) akmodsbuild: ${line}" >> "${kmodlogfile}"
+ echo "$(date +%Y/%m/%d\ %H:%M:%S) akmodsbuild: ${line}" >> "${kmodlogfile}"
done < "${tmpdir}"/akmodsbuild.log
fi
@@ -268,9 +268,9 @@
return 4
fi
- # install
+ # yum install - repository disabled on purpose see rfbz#3350
akmods_echo 1 4 "Installing newly built rpms"
- rpm -U $(find "${tmpdir}results" -type f -name '*.rpm' | grep -v debuginfo) >> "${kmodlogfile}" 2>&1
+ yum -y install --disablerepo='*' $(find "${tmpdir}results" -type f -name '*.rpm' | grep -v debuginfo) >> "${kmodlogfile}" 2>&1
local returncode=$?
# place the newly built rpms where user expects them
Index: akmods-shutdown.service
===================================================================
RCS file: /cvs/free/rpms/akmods/F-20/akmods-shutdown.service,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- akmods-shutdown.service 22 Dec 2012 16:02:20 -0000 1.1
+++ akmods-shutdown.service 8 Apr 2015 10:00:41 -0000 1.2
@@ -6,7 +6,8 @@
[Service]
Type=oneshot
RemainAfterExit=yes
-ExecStart=-/usr/sbin/akmods --from-init
+ExecStart=/bin/true
+ExecStop=-/usr/sbin/akmods --from-init
[Install]
WantedBy=multi-user.target
Index: akmods.spec
===================================================================
RCS file: /cvs/free/rpms/akmods/F-20/akmods.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- akmods.spec 11 Jan 2013 15:06:41 -0000 1.18
+++ akmods.spec 8 Apr 2015 10:00:41 -0000 1.19
@@ -1,11 +1,11 @@
Name: akmods
-Version: 0.5.1
-Release: 3%{?dist}
+Version: 0.5.2
+Release: 1%{?dist}
Summary: Automatic kmods build and install tool
-Group: System Environment/Kernel
License: MIT
URL: http://rpmfusion.org/Packaging/KernelModules/Akmods
+
Source0: akmods
Source1: akmods.1
Source2: akmodsbuild
@@ -38,10 +38,10 @@
Requires(pre): shadow-utils
# systemd unit requirements.
-BuildRequires: systemd-units
-Requires(post): systemd-units
-Requires(preun): systemd-units
-Requires(postun): systemd-units
+BuildRequires: systemd
+Requires(post): systemd
+Requires(preun): systemd
+Requires(postun): systemd
%description
@@ -94,13 +94,11 @@
fi
%preun
-if [ $1 -eq 0 ] ; then
- # Package removal, not upgrade
- /bin/systemctl --no-reload disable akmods.service > /dev/null 2>&1 || :
- /bin/systemctl stop akmods.service > /dev/null 2>&1 || :
- /bin/systemctl --no-reload disable akmods-shutdown.service > /dev/null 2>&1 || :
- /bin/systemctl stop akmods-shutdown.service > /dev/null 2>&1 || :
-fi
+%systemd_preun akmods.service
+%systemd_preun akmods-shutdown.service
+
+%postun
+%systemd_postun
%files
@@ -116,6 +114,17 @@
%changelog
+* Wed Apr 4 2015 Richard Shaw <hobbes1069(a)gmail.com> - 0.5.2-1
+- Fix temporary directory creation when TMPDIR environment variable is set,
+ fixes BZ#2596.
+- Update systemd scripts to use macros.
+- Fix akmods run on shutdown systemd unit file, fixes BZ#3503.
+
+* Sun Nov 16 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 0.5.1-4
+- Fix akmods on armhfp - rfbz#3117
+- Use yum instead of rpm to install packages - rfbz#3350
+ Switch to a better date format
+
* Fri Jan 11 2013 Richard Shaw <hobbes1069(a)gmail.com> - 0.5.1-3
- Really fix akmods.service.in.
Index: akmodsbuild
===================================================================
RCS file: /cvs/free/rpms/akmods/F-20/akmodsbuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- akmodsbuild 5 Mar 2012 14:57:17 -0000 1.3
+++ akmodsbuild 8 Apr 2015 10:00:41 -0000 1.4
@@ -28,6 +28,9 @@
# defaults that might get overwritten by user:
kernels="$(uname -r)"
target="$(uname -m)"
+if [[ "${target}" == "armv7l" ]]; then
+ target="armv7hl"
+fi
numberofjobs=$(grep -c processor /proc/cpuinfo 2> /dev/null)
verboselevel=2
outputdir="${PWD}"
@@ -85,7 +88,7 @@
## preparations
# tmpdir
- if ! tmpdir="$(mktemp -d -t ${myprog}.XXXXXXXX)" ; then
+ if ! tmpdir="$(mktemp -d -p /tmp ${myprog}.XXXXXXXX)" ; then
echo "ERROR: Could create tempdir."
exit 1
fi
9 years
rpms/nvidia-kmod/devel nvidia-kmod.spec, 1.196, 1.197 4.0.0_kernel.patch, 1.1, NONE
by Leigh Scott
Author: leigh123linux
Update of /cvs/nonfree/rpms/nvidia-kmod/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv6788
Modified Files:
nvidia-kmod.spec
Removed Files:
4.0.0_kernel.patch
Log Message:
* Wed Apr 08 2015 Leigh Scott <leigh123linux(a)googlemail.com> - 1:346.59-1
- Update to 343.59
- drop 4.0.0 kernel patch
Index: nvidia-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/devel/nvidia-kmod.spec,v
retrieving revision 1.196
retrieving revision 1.197
diff -u -r1.196 -r1.197
--- nvidia-kmod.spec 8 Apr 2015 06:33:35 -0000 1.196
+++ nvidia-kmod.spec 8 Apr 2015 06:51:06 -0000 1.197
@@ -17,7 +17,6 @@
Source11: nvidia-kmodtool-excludekernel-filterfile
Patch0: nv-linux-arm.patch
-Patch1: 4.0.0_kernel.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -44,7 +43,6 @@
tar --use-compress-program xz -xf %{_datadir}/%{name}-%{version}/%{name}-%{version}-%{_target_cpu}.tar.xz
# patch loop
%patch0 -p1
-%patch1 -p1
for kernel_version in %{?kernel_versions} ; do
@@ -94,6 +92,7 @@
%changelog
* Wed Apr 08 2015 Leigh Scott <leigh123linux(a)googlemail.com> - 1:346.59-1
- Update to 343.59
+- drop 4.0.0 kernel patch
* Mon Mar 30 2015 Nicolas Chauvet <kwizart(a)gmail.com> - 1:346.47-2.4
- Rebuilt for kernel
--- 4.0.0_kernel.patch DELETED ---
9 years
rpms/nvidia-kmod/devel nvidia-kmod.spec,1.195,1.196
by Leigh Scott
Author: leigh123linux
Update of /cvs/nonfree/rpms/nvidia-kmod/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv6266
Modified Files:
nvidia-kmod.spec
Log Message:
* Wed Apr 08 2015 Leigh Scott <leigh123linux(a)googlemail.com> - 1:346.59-1
- Update to 343.59
Index: nvidia-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/devel/nvidia-kmod.spec,v
retrieving revision 1.195
retrieving revision 1.196
diff -u -r1.195 -r1.196
--- nvidia-kmod.spec 30 Mar 2015 13:37:20 -0000 1.195
+++ nvidia-kmod.spec 8 Apr 2015 06:33:35 -0000 1.196
@@ -3,13 +3,13 @@
# "buildforkernels newest" macro for just that build; immediately after
# queuing that build enable the macro again for subsequent builds; that way
# a new akmod package will only get build when a new one is actually needed
-%global buildforkernels newest
+%global buildforkernels current
Name: nvidia-kmod
Epoch: 1
-Version: 346.47
+Version: 346.59
# Taken over by kmodtool
-Release: 2%{?dist}.4
+Release: 1%{?dist}
Summary: NVIDIA display driver kernel module
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -92,6 +92,9 @@
%changelog
+* Wed Apr 08 2015 Leigh Scott <leigh123linux(a)googlemail.com> - 1:346.59-1
+- Update to 343.59
+
* Mon Mar 30 2015 Nicolas Chauvet <kwizart(a)gmail.com> - 1:346.47-2.4
- Rebuilt for kernel
9 years
rpms/xorg-x11-drv-nvidia/devel .cvsignore, 1.74, 1.75 sources, 1.78, 1.79 xorg-x11-drv-nvidia.spec, 1.172, 1.173
by Leigh Scott
Author: leigh123linux
Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv6056
Modified Files:
.cvsignore sources xorg-x11-drv-nvidia.spec
Log Message:
* Wed Apr 08 2015 Leigh Scott <leigh123linux(a)googlemail.com> - 1:346.59-1
- Update to 343.59
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/devel/.cvsignore,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- .cvsignore 24 Feb 2015 17:53:01 -0000 1.74
+++ .cvsignore 8 Apr 2015 06:30:56 -0000 1.75
@@ -1,3 +1,3 @@
-NVIDIA-Linux-armv7l-gnueabihf-346.47.run
-NVIDIA-Linux-x86-346.47.run
-NVIDIA-Linux-x86_64-346.47.run
+NVIDIA-Linux-armv7l-gnueabihf-346.59.run
+NVIDIA-Linux-x86-346.59.run
+NVIDIA-Linux-x86_64-346.59.run
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/devel/sources,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- sources 24 Feb 2015 17:53:01 -0000 1.78
+++ sources 8 Apr 2015 06:30:56 -0000 1.79
@@ -1,3 +1,3 @@
-10f1bd71d061cadf5c716bdd03f4b5b2 NVIDIA-Linux-armv7l-gnueabihf-346.47.run
-ae61b6c3c081383f991bcc64ee0844b1 NVIDIA-Linux-x86-346.47.run
-3fd4affac0165058fcdbbc6f18d84e2d NVIDIA-Linux-x86_64-346.47.run
+ab738899ae9df323fffb244114589795 NVIDIA-Linux-armv7l-gnueabihf-346.59.run
+565800c3d9bf347eb35a393f48a6b7f3 NVIDIA-Linux-x86-346.59.run
+48af6c1e518bbfa204849003a1a44bc5 NVIDIA-Linux-x86_64-346.59.run
Index: xorg-x11-drv-nvidia.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/devel/xorg-x11-drv-nvidia.spec,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -r1.172 -r1.173
--- xorg-x11-drv-nvidia.spec 24 Feb 2015 17:53:01 -0000 1.172
+++ xorg-x11-drv-nvidia.spec 8 Apr 2015 06:30:56 -0000 1.173
@@ -7,7 +7,7 @@
Name: xorg-x11-drv-nvidia
Epoch: 1
-Version: 346.47
+Version: 346.59
Release: 1%{?dist}
Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards
@@ -515,6 +515,9 @@
%{_nvidia_libdir}/libnvidia-fbc.so
%changelog
+* Wed Apr 08 2015 Leigh Scott <leigh123linux(a)googlemail.com> - 1:346.59-1
+- Update to 343.59
+
* Tue Feb 24 2015 Leigh Scott <leigh123linux(a)googlemail.com> - 1:346.47-1
- Update to 343.47
9 years
rpms/xvst/devel beeg.patch, NONE, 1.1 chilloutzone.patch, NONE, 1.1 disable_update.patch, NONE, 1.1 keezmovies.patch, NONE, 1.1 myvideo.patch, NONE, 1.1 sunporno.patch, NONE, 1.1 wat.tv.patch, NONE, 1.1 xvst.desktop, NONE, 1.1 xvst.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
by Martin Gansser
Author: martinkg
Update of /cvs/free/rpms/xvst/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv1509/devel
Modified Files:
.cvsignore sources
Added Files:
beeg.patch chilloutzone.patch disable_update.patch
keezmovies.patch myvideo.patch sunporno.patch wat.tv.patch
xvst.desktop xvst.spec
Log Message:
beeg.patch:
beeg.js | 122 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 122 insertions(+)
--- NEW FILE beeg.patch ---
New plugin.
Index: xvst-2.5/resources/services/beeg/beeg.js
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ xvst-2.5/resources/services/beeg/beeg.js 2013-03-29 17:01:19.486267000 +0100
@@ -0,0 +1,122 @@
+/*
+*
+* This file is part of xVideoServiceThief,
+* an open-source cross-platform Video service download
+*
+* 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
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with xVideoServiceThief. If not, see <http://www.gnu.org/licenses/>.
+*
+* Contact e-mail: Xesc <xeskuu.xvst(a)gmail.com>
+* Program URL : http://xviservicethief.sourceforge.net/
+*
+*/
+
+function RegistVideoService()
+{
+ this.version = "3.1.0";
+ this.minVersion = "2.0.0a";
+ this.author = "Xesc & Technology 2009";
+ this.website = "http://www.beeg.com/";
+ this.ID = "beeg.com";
+ this.caption = "beeg.";
+ this.adultContent = true;
+ this.musicSite = false;
+}
+
+function getVideoInformation(url)
+{
+ // video information
+ var result = new VideoDefinition();
+ // download webpage
+ var http = new Http();
+ var html = http.downloadWebpage(url);
+ // get video title
+ result.title = copyBetween(html, "<title>", "</title>");
+ // get the flv url
+ result.URL = copyBetween(html, "so.addVariable('file','", "');");
+ if(result.URL == "") {
+ result.URL = copyBetween(html, "'file': '", "',");
+ }
+ // return the video information
+ return result;
+}
+
+function searchVideos(keyWord, pageIndex)
+{
+ const URL_SEARCH = "http://beeg.com/section/home/%1/";
+ const HTML_SEARCH_ID = 'var tumbid =[';
+ const HTML_SEARCH_ALT = 'var tumbalt =[';
+ const HTML_SEARCH_END = '];';
+ const RESULTS_PER_PAGE = 5;
+ var nCurrentPageIndex = 1;
+ var nResultsToSkip = (pageIndex - 1) * RESULTS_PER_PAGE ;
+ var nCurrentResults = 0;
+ // remember the first ID so if we find again we know we searched past the last site
+ var nFirstId = -1;
+ // init search results object
+ var searchResults = new SearchResults();
+ while(nCurrentResults < RESULTS_PER_PAGE) {
+ // init http object
+ var http = new Http();
+ var html = http.downloadWebpage(strFormat(URL_SEARCH, nCurrentPageIndex));
+ // did we reach the end?
+ if(strIndexOf(html, HTML_SEARCH_ID, 0, false) == -1) {
+ break;
+ }
+ var IDs = copyBetween(html, HTML_SEARCH_ID, HTML_SEARCH_END);
+ var Alts = copyBetween(html, HTML_SEARCH_ALT, HTML_SEARCH_END);
+ // if we found some results then...
+ if (IDs != "")
+ {
+ // the IDs and alt-texts are JavaScript arrays already
+ var IDblocks = eval('[' + IDs + ']');
+ var Altblocks = eval('[' + Alts + ']');
+ for (n = 0; n < IDblocks.length; n++) {
+ var title = Altblocks[n];
+ var videoURL = "http://beeg.com/" + IDblocks[n];
+ var imageURL = "http://cdn.anythumb.com/120x90/" + IDblocks[n] + ".jpg";
+ var imageId = IDblocks[n]
+ if(nFirstId == -1) {
+ nFirstId = imageId;
+ } else if(nFirstId == imageId) {
+ // we found the same imageId again. Stop the search.
+ return searchResults;
+ }
+ if(strIndexOf(title, keyWord, 0, false) != -1) {
+ //print('[' + nResultsToSkip + '][' + nCurrentResults + '] ' + title);
+ if(nResultsToSkip > 0) {
+ nResultsToSkip--;
+ } else {
+ if( nCurrentResults < RESULTS_PER_PAGE ) {
+ searchResults.addSearchResult(videoURL, imageURL, title, title, 0, 0);
+ nCurrentResults++;
+ }
+ if( nCurrentResults >= RESULTS_PER_PAGE ) {
+ break;
+ }
+ }
+ }
+ }
+ }
+ nCurrentPageIndex++;
+ }
+ // return search results
+ return searchResults;
+}
+
+function getVideoServiceIcon()
+{
+ return "http://beeg.com/favicon.ico";
+}
chilloutzone.patch:
chilloutzone.js | 93 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 93 insertions(+)
--- NEW FILE chilloutzone.patch ---
New plugin.
Index: xvst-2.4.1/resources/services/chilloutzone/chilloutzone.js
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ xvst-2.4.1/resources/services/chilloutzone/chilloutzone.js 2011-10-15 22:40:55.982365314 +0200
@@ -0,0 +1,93 @@
+/*
+*
+* This file is part of xVideoServiceThief,
+* an open-source cross-platform Video service download
+*
+* 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
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with xVideoServiceThief. If not, see <http://www.gnu.org/licenses/>.
+*
+* Contact e-mail: Xesc <xeskuu.xvst(a)gmail.com>
+* Program URL : http://xviservicethief.sourceforge.net/
+*
+*/
+
+function RegistVideoService()
+{
+ this.version = "1.0.0";
+ this.minVersion = "2.0.0a";
+ this.author = "crapmaster & Xesc & Technology 2009";
+ this.website = "http://www.chilloutzone.net";
+ this.ID = "chilloutzone.net";
+ this.caption = "chilloutzone";
+ this.adultContent = false;
+ this.musicSite = false;
+}
+
+function getVideoInformation(url)
+{
+ // video information
+ var result = new VideoDefinition();
+ // download webpage
+ var http = new Http();
+ var html = http.downloadWebpage(url);
+ // get video title
+ result.title = copyBetween(html, '<h3 id="content-player-head">', '</h3>');
+ // get the xml url
+ var xmlUrl = copyBetween(html, 'var MOVIE_LOC_PLAIN = "', '";');
+ // get url
+ result.URL=cleanUrl(xmlUrl);
+ // return the video information
+ return result;
+}
+
+function getVideoServiceIcon()
+{
+ 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,0x06,0x00,0x00,0x00,0x1f,0xf3,0xff,
+ 0x61,0x00,0x00,0x00,0x01,0x73,0x52,0x47,0x42,0x00,0xae,0xce,0x1c,0xe9,0x00,0x00,
+ 0x00,0x06,0x62,0x4b,0x47,0x44,0x00,0xff,0x00,0xff,0x00,0xff,0xa0,0xbd,0xa7,0x93,
+ 0x00,0x00,0x00,0x09,0x70,0x48,0x59,0x73,0x00,0x00,0x0b,0x13,0x00,0x00,0x0b,0x13,
+ 0x01,0x00,0x9a,0x9c,0x18,0x00,0x00,0x00,0x07,0x74,0x49,0x4d,0x45,0x07,0xdb,0x0a,
+ 0x08,0x15,0x29,0x04,0x62,0xef,0x4c,0x6b,0x00,0x00,0x01,0xa6,0x49,0x44,0x41,0x54,
+ 0x38,0xcb,0xa5,0x93,0xbf,0x8a,0x14,0x41,0x10,0xc6,0x7f,0x5d,0xbd,0x3b,0x7f,0xd6,
+ 0xd3,0xf8,0xde,0x40,0x0d,0x14,0x0d,0x2e,0x31,0xd0,0xc8,0xc4,0xc0,0xc4,0x40,0x0f,
+ 0x8c,0x7d,0x81,0x0b,0x04,0xdf,0x41,0xd4,0xa7,0x38,0xd0,0xc8,0xc0,0x03,0x23,0x65,
+ 0x40,0xbd,0xbd,0x45,0x91,0x3d,0xc4,0x54,0x10,0xc5,0xc4,0x3d,0x0e,0x95,0xfd,0x33,
+ 0xdd,0x53,0x06,0xd5,0xbb,0x3b,0x2b,0x87,0x9c,0x58,0xd0,0x74,0x4d,0x57,0xd7,0x57,
+ 0x5f,0x7d,0x3d,0x05,0xff,0x69,0x0e,0x40,0x0f,0x6f,0x29,0x1a,0x20,0x44,0x08,0x0d,
+ 0xc4,0xe4,0xd7,0x11,0xea,0x90,0xd6,0x1f,0xfe,0xd7,0x12,0x77,0x7b,0xd7,0x75,0x00,
+ 0x88,0x23,0xb8,0xf3,0x02,0xbc,0x40,0x57,0x20,0x13,0xe8,0x38,0xc8,0x05,0xba,0x1e,
+ 0x72,0x67,0x67,0x65,0xfa,0x2e,0x84,0x77,0xcf,0xc7,0x54,0x55,0xa5,0x06,0x50,0x87,
+ 0x94,0xec,0xe0,0xdc,0x15,0xf0,0x0e,0x3e,0xbd,0xb2,0xa4,0xdc,0x41,0xee,0x0d,0x2c,
+ 0xb7,0x64,0x0a,0x4f,0x18,0x47,0x00,0xc4,0x00,0x62,0xba,0xec,0x6d,0xdf,0xda,0x81,
+ 0xeb,0xf7,0xe0,0xec,0x65,0x28,0x3b,0x50,0x7a,0x28,0x3c,0xf4,0x24,0xf9,0x42,0xfd,
+ 0xab,0x01,0x20,0x31,0x68,0xac,0x42,0x96,0x58,0x00,0x5c,0xbd,0x6b,0xfb,0xeb,0xfb,
+ 0xf0,0x6d,0x17,0x46,0x7d,0xbb,0x53,0x18,0x9b,0x30,0x6d,0x90,0x25,0x40,0x58,0xd2,
+ 0xec,0xca,0xaa,0xcc,0x97,0xb6,0x6c,0xdf,0x7f,0x04,0x07,0x7b,0xf0,0x63,0x60,0x00,
+ 0x13,0x25,0x5b,0x00,0xcc,0xa2,0xf5,0x36,0xaf,0xd0,0xb6,0xf7,0x0f,0xe1,0x7b,0x1f,
+ 0x0e,0x07,0x8b,0xfe,0xc9,0x85,0x38,0x6d,0xb7,0x30,0x0b,0x16,0x28,0x92,0x06,0x00,
+ 0x6f,0x1f,0x58,0xe2,0x68,0xcf,0xce,0xe7,0x3a,0x24,0x51,0xeb,0x89,0x52,0xae,0x30,
+ 0xe8,0x79,0xc8,0x12,0xc0,0xb3,0x9b,0x70,0xd0,0xb7,0xb6,0x7a,0x7e,0xa9,0xfe,0xfc,
+ 0x25,0x72,0x21,0xcc,0x56,0x18,0xd4,0x89,0x81,0x58,0x9f,0x99,0x98,0xfa,0x99,0x4b,
+ 0x6f,0x3f,0x4f,0x4e,0x2b,0x83,0x66,0xa6,0x2d,0x80,0x2f,0x27,0x18,0xbe,0xf9,0x4c,
+ 0x3d,0x6e,0x88,0x13,0x08,0x53,0x65,0x6d,0xdd,0x73,0xfe,0xc6,0x19,0x38,0xf5,0x73,
+ 0x51,0xfd,0xe9,0xb5,0x8f,0xc4,0x5a,0x69,0x6a,0x45,0x9b,0xd6,0xaf,0xfc,0x37,0xd3,
+ 0xed,0x0d,0xe5,0xf4,0x14,0x4e,0x0a,0x4f,0x2e,0x0e,0x59,0xdf,0x79,0xf9,0xef,0x03,
+ 0xa3,0xdb,0x1b,0xaa,0x1f,0x2e,0xe8,0xe3,0x35,0xd1,0xaa,0xaa,0xb4,0x1d,0x93,0x63,
+ 0x4d,0xdc,0xe6,0xc0,0x31,0xec,0x1e,0x19,0x93,0x63,0x8f,0xed,0xe6,0xc0,0x1d,0x45,
+ 0xff,0x37,0x2f,0x00,0x9b,0x4b,0xdd,0xfa,0x20,0xe7,0x00,0x00,0x00,0x00,0x49,0x45,
+ 0x4e,0x44,0xae,0x42,0x60,0x82);
+}
\ No newline at end of file
disable_update.patch:
options.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- NEW FILE disable_update.patch ---
The update will not work anyway.
Index: xvst-2.5.1/src/options.cpp
===================================================================
--- 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";
- installAutomaticallyUpdates = true;
+ installAutomaticallyUpdates = false;
lastUpdate = QDate(2007, 01, 01);
- checkForUpdatesOnStartup = true;
+ checkForUpdatesOnStartup = false;
checkForUpdatesEvery = 1;
displayBugReport = true;
keezmovies.patch:
keezmovies.js | 105 ++++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 file changed, 98 insertions(+), 7 deletions(-)
--- NEW FILE keezmovies.patch ---
# update plugin
Index: xvst-2.5.1/resources/services/keezmovies/keezmovies.js
===================================================================
--- xvst-2.5.1.orig/resources/services/keezmovies/keezmovies.js 2014-01-10 20:28:16.225627825 +0100
+++ xvst-2.5.1/resources/services/keezmovies/keezmovies.js 2014-01-10 20:30:28.293623896 +0100
@@ -23,9 +23,8 @@
*
*/
-function RegistVideoService()
-{
- this.version = "1.0.4a";
+function RegistVideoService() {
+ this.version = "1.0.5";
this.minVersion = "2.0.0a";
this.author = "Xesc & Technology 2014";
this.website = "http://www.keezmovies.com/";
@@ -35,8 +34,7 @@
this.musicSite = false;
}
-function getVideoInformation(url)
-{
+function getVideoInformation(url) {
// video information
var result = new VideoDefinition();
// download webpage
@@ -53,8 +51,101 @@
return result;
}
-function getVideoServiceIcon()
-{
+function searchVideos(keyWord, pageIndex) {
+ const URL_SEARCH = "http://www.keezmovies.com/video?search=%1&page=%2";
+ const HTML_SEARCH_START = '<div class="pag2Block float-left" style="width:804px;">';
+ const HTML_SEARCH_FINISH = '<div class="gray-border block friend-row">';
+ const HTML_SEARCH_SEPARATOR = "</li>";
+
+ // replace all spaces for "+"
+ keyWord = strReplace(keyWord, " ", "+");
+
+ // init search results object
+ var searchResults = new SearchResults();
+
+ // init http object
+ var http = new Http();
+ var html = http.downloadWebpage(strFormat(URL_SEARCH, keyWord, pageIndex));
+
+ var noResIx = strIndexOf(html, "did not match any videos");
+ if (noResIx == -1) {
+
+ // get the search summary
+ var summary = copyBetween(html, '<h2 class="title float-left">', '</h2>');
+ searchResults.setSummary(summary);
+
+ // get results html block
+ var htmlResults = copyBetween(html, HTML_SEARCH_START, HTML_SEARCH_FINISH);
+
+ // if we found some results then...
+ if (htmlResults != "") {
+ var blocks = splitString(htmlResults, HTML_SEARCH_SEPARATOR);
+ for (n = 0; n < blocks.length-1; n++)
+ parseResultItem(searchResults, blocks[n]);
+ }
+ }
+
+ // return search results
+ return searchResults;
+}
+
+function cleanSummary(summary) {
+ // remove all "\n"
+ summary = strReplace(summary, "\n", "");
+
+ // remove unused tags
+ summary = strReplace(summary, "</span>", '');
+ summary = strReplace(summary, "<span>", '');
+ summary = strReplace(summary, "<em>", '');
+ summary = strReplace(summary, "</em>", '');
+
+ // remove "
+ summary = strReplace(summary, """, "");
+
+ // return cleanned summary
+ return summary;
+}
+
+function parseResultItem(searchResults, html) {
+ // vars
+ var tmp, videoUrl, imageUrl, title, description, duration, rating;
+
+ // get video url
+ videoUrl = copyBetween(html, 'href="', '"');
+
+ // get title and image url
+ tmp= copyBetween(html, '<img', '/>');
+ title = copyBetween(tmp, 'alt="', '"');
+ imageUrl = copyBetween(tmp, 'src="', '"');
+
+ // get video description
+ description = "";
+
+ // get video duration
+ tmp = copyBetween(html, '<var class="duration">', '</var>');
+ duration = convertToSeconds(tmp);
+
+ // get rating
+ rating = copyBetween(html, '<strong >', '%</strong>')/10;
+
+ // add to results list
+ searchResults.addSearchResult(videoUrl, imageUrl, title, description, duration, rating);
+}
+
+function convertToSeconds(text) {
+ // how many ":" exists?
+ var count = getTokenCount(text, ":");
+
+ // get mins and seconds
+ var h = new Number(h = count == 3 ? getToken(tmp2, ":", 0) * 3600 : 0);
+ var m = new Number(getToken(text, ":", count - 2) * 60);
+ var s = new Number(getToken(text, ":", count - 1));
+
+ // convert h:m:s to seconds
+ return h + m + s;
+}
+
+function getVideoServiceIcon() {
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,
myvideo.patch:
myvideo.js | 358 ++++++++++++++++++++++++++++++-------------------------------
1 file changed, 179 insertions(+), 179 deletions(-)
--- NEW FILE myvideo.patch ---
Update myvideo plugin.
Index: xvst-2.4.1/resources/services/myvideo/myvideo.js
===================================================================
--- xvst-2.4.1.orig/resources/services/myvideo/myvideo.js 2011-10-15 22:31:29.502370150 +0200
+++ xvst-2.4.1/resources/services/myvideo/myvideo.js 2011-10-15 22:31:42.338370040 +0200
@@ -1,179 +1,179 @@
-/*
-*
-* This file is part of xVideoServiceThief,
-* an open-source cross-platform Video service download
-*
-* 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
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with xVideoServiceThief. If not, see <http://www.gnu.org/licenses/>.
-*
-* Contact e-mail: Xesc <xeskuu.xvst(a)gmail.com>
-* Program URL : http://xviservicethief.sourceforge.net/
-*
-*/
-
-function RegistVideoService()
-{
- this.version = "2.0.0";
- this.minVersion = "2.0.0a";
- this.author = "Xesc & Technology 2009";
- this.website = "http://www.myvideo.de/";
- this.ID = "myvideo.de";
- this.caption = "MyVideo";
- this.adultContent = false;
- this.musicSite = false;
-}
-
-function getVideoInformation(url)
-{
- const URL_FLV = "%1/%2.flv";
- // video information
- var result = new VideoDefinition();
- // download webpage
- var http = new Http();
- var html = http.downloadWebpage(url);
- // get the flv url and params
- var path = copyBetween(html, "<link rel='image_src' href='", "/thumbs");
- var vidId = copyBetween(html, path + "/thumbs/", "_");
- // get the video title
- result.title = copyBetween(html, "entry-title'>", "</a>");
- // build final url
- result.URL = strFormat(URL_FLV, path, vidId);
- // get cookies
- result.cookies = http.getCookies("|");
- // return the video information
- return result;
-}
-
-function searchVideos(keyWord, pageIndex)
-{
- const URL_SEARCH = "http://www.myvideo.de/Videos_A-Z?lpage=%2&searchWord=%1&searchOrder=0";
- const HTML_SEARCH_START = "<table class='body sCenter vl_newMargin'>"; //'<div class="lBox lLeftBox globalBxBorder globalBx video_list">';
- const HTML_SEARCH_FINISH = '</table>'; //"</body>";
- const HTML_SEARCH_SEPARATOR = "<td class='body sTLeft hslice entry-content vCont' id='slice_";
- // replace all spaces for "+"
- keyWord = strReplace(keyWord, " ", "+");
- // init search results object
- var searchResults = new SearchResults();
- // init http object
- var http = new Http();
- var html = http.downloadWebpage(strFormat(URL_SEARCH, keyWord, pageIndex, searchResults.getUserLanguage()));
- // get the search summary
- var tmp = copyBetween(html, '<td> Dein Ergebnis', '</td>');
- var summary = "Dein Ergebnis" + copyBetween(tmp, "<span class='sWord'>", "'");
- var tmp = copyBetween(html, "<span class='pView pnPages'>", "</span>");
- var summary = summary + " " + tmp
- var tmp = copyBetween(html, "<span class='pView pnResults'>", "</span>");
- var summary = summary + " " + tmp
- searchResults.setSummary(summary);
- // get results html block
- var htmlResults = copyBetween(html, HTML_SEARCH_START, HTML_SEARCH_FINISH);
- // if we found some results then...
- if (htmlResults != "")
- {
- var block = "";
- // iterate over results
- while ((block = copyBetween(htmlResults, HTML_SEARCH_SEPARATOR, HTML_SEARCH_SEPARATOR)) != "")
- {
- parseResultItem(searchResults, block);
- htmlResults = strRemove(htmlResults, 0, block.toString().length);
- }
- // get last result
- parseResultItem(searchResults, htmlResults);
- }
- // return search results
- return searchResults;
-}
-
-function parseResultItem(searchResults, html)
-{
- const VIDEO_URL = "http://www.myvideo.de";
- // vars
- var tmp, videoUrl, imageUrl, title, description, duration, rating;
- // get title and image url
- tmp = copyBetween(html, "<div class='vThumb'>", '</div>') ;
- title = copyBetween(tmp, "title='", "'");
- imageUrl = copyBetween(tmp, "src='", "'");
- // get video url
- videoUrl = VIDEO_URL + copyBetween(tmp, "href='", "'");
- //if (strIndexOf(imageUrl, "default.jpg") == -1) // if is not a "default.jpg"...
- // imageUrl = copyBetween(tmp, 'thumb="', '"');
- // get video description
- tmp = copyBetween(html, "<div class='sCenter vTitle'>", '</div>') ;
- description = copyBetween(tmp, "<span class='hidden'>", '</span>');
- // get video duration
- tmp = copyBetween(html, ' Lnge ', '/span>');
- duration = convertToSeconds(copyBetween(tmp, "> ", '<'));
- // get rating
- rating = getrating(copyBetween(html, 'ratingBox', '</div>'));
- // add to results list
- searchResults.addSearchResult(videoUrl, imageUrl, title, description, duration, rating);
-}
-
-function getrating(text)
-{
- var rating = 0
- var i = 1
- while (i < 6)
- {
- var part = getToken(text, '<img',i);
- if (strIndexOf(part,"m_star_red_0.gif") != -1)
- {
- rating = rating + 1
- }
- if (strIndexOf(part,"m_star_half_0.gif") != -1)
- {
- rating = rating + 0.5
- }
- i++
- }
- return rating;
-}
-
-function convertToSeconds(text)
-{
- // how many ":" exists?
- var count = getTokenCount(text, ":");
- // get mins and seconds
- var h = new Number(h = count == 3 ? getToken(text, ":", 0) * 3600 : 0);
- var m = new Number(getToken(text, ":", count - 2) * 60);
- var s = new Number(getToken(text, ":", count - 1));
- // convert h:m:s to seconds
- return h + m + s;
-}
-
-function getVideoServiceIcon()
-{
- 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,0x66,0x50,0x4c,0x54,0x45,0x3d,0x88,0xe5,0x49,0x8f,0xe7,0x55,
- 0x97,0xe8,0x61,0x9e,0xea,0x62,0x9e,0xea,0x6e,0xa6,0xec,0x7a,0xad,0xed,0x85,0xb5,
- 0xee,0x86,0xb5,0xef,0x92,0xbc,0xf0,0x9e,0xc3,0xf2,0x9e,0xc4,0xf2,0xaa,0xcb,0xf4,
- 0xb6,0xd2,0xf5,0xc2,0xda,0xf7,0xce,0xe1,0xf8,0xda,0xe9,0xfa,0xdb,0xe9,0xfa,0xe7,
- 0xf0,0xfc,0xf3,0xf8,0xfd,0xff,0x66,0x00,0xff,0x70,0x10,0xff,0x79,0x20,0xff,0x8c,
- 0x40,0xff,0x96,0x50,0xff,0x9f,0x60,0xff,0xb3,0x80,0xff,0xbc,0x8f,0xff,0xc6,0x9f,
- 0xff,0xcf,0xaf,0xff,0xd9,0xbf,0xff,0xec,0xe0,0xff,0xf5,0xef,0xff,0xff,0xff,0x48,
- 0xd7,0xaa,0x42,0x00,0x00,0x00,0x8c,0x49,0x44,0x41,0x54,0x18,0x19,0x05,0xc1,0x09,
- 0x42,0xc2,0x30,0x14,0x05,0xc0,0x17,0x4a,0x2b,0x01,0x0a,0x4a,0x3e,0x54,0x71,0x9d,
- 0xfb,0x5f,0xd2,0x99,0x60,0xf4,0x96,0x76,0x1c,0x40,0x18,0xfb,0xec,0xfa,0x69,0xda,
- 0x0f,0x10,0x96,0x2c,0xe3,0x36,0xac,0x0b,0x88,0xd7,0xec,0xc6,0x5b,0x47,0xbf,0x42,
- 0xf4,0x9c,0x2d,0xc3,0xb7,0x71,0x80,0x98,0x73,0x33,0xb3,0x3d,0x7e,0x4e,0x10,0x2d,
- 0xec,0xd8,0xaa,0xde,0x7f,0x11,0x09,0xad,0xdb,0xaa,0xea,0xfe,0x49,0x24,0xf4,0xd8,
- 0xaa,0xaa,0xea,0x43,0xcc,0xb9,0x19,0x93,0xad,0xaa,0x1e,0x5f,0xc4,0x21,0x2b,0x6c,
- 0x75,0x7f,0x42,0xac,0x99,0x61,0x7b,0xfe,0xbd,0x40,0x8c,0x96,0x0b,0x38,0x1f,0x21,
- 0x9c,0xd3,0x2e,0x58,0xdb,0x80,0xe0,0x90,0x4c,0xf3,0x94,0x0b,0x08,0x1c,0x5b,0xb2,
- 0xbf,0x02,0xff,0xae,0x67,0x16,0x49,0x16,0x8a,0x4e,0x0f,0x00,0x00,0x00,0x00,0x49,
- 0x45,0x4e,0x44,0xae,0x42,0x60,0x82);
-}
+/*
+*
+* This file is part of xVideoServiceThief,
+* an open-source cross-platform Video service download
+*
+* 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
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with xVideoServiceThief. If not, see <http://www.gnu.org/licenses/>.
+*
+* Contact e-mail: Xesc <xeskuu.xvst(a)gmail.com>
+* Program URL : http://xviservicethief.sourceforge.net/
+*
+*/
+
+function RegistVideoService()
+{
+ this.version = "2.0.1";
+ this.minVersion = "2.0.0a";
+ this.author = "Xesc & Technology 2009";
+ this.website = "http://www.myvideo.de/";
+ this.ID = "myvideo.de";
+ this.caption = "MyVideo";
+ this.adultContent = false;
+ this.musicSite = false;
+}
+
+function getVideoInformation(url)
+{
+ const URL_FLV = "%1/%2.flv";
+ // video information
+ var result = new VideoDefinition();
+ // download webpage
+ var http = new Http();
+ var html = http.downloadWebpage(url);
+ // get the flv url and params
+ var path = copyBetween(html, "<link rel='image_src' href='", "/thumbs");
+ var vidId = copyBetween(html, path + "/thumbs/", "_");
+ // get the video title
+ result.title = copyBetween(html, "<h1 class='globalHd'>", "</h1>");
+ // build final url
+ result.URL = strFormat(URL_FLV, path, vidId);
+ // get cookies
+ result.cookies = http.getCookies("|");
+ // return the video information
+ return result;
+}
+
+function searchVideos(keyWord, pageIndex)
+{
+ const URL_SEARCH = "http://www.myvideo.de/Videos_A-Z?lpage=%2&searchWord=%1&searchOrder=0";
+ const HTML_SEARCH_START = "<table class='body sCenter vl_newMargin'>"; //'<div class="lBox lLeftBox globalBxBorder globalBx video_list">';
+ const HTML_SEARCH_FINISH = '</table>'; //"</body>";
+ const HTML_SEARCH_SEPARATOR = "<td class='body sTLeft hslice entry-content vCont' id='slice_";
+ // replace all spaces for "+"
+ keyWord = strReplace(keyWord, " ", "+");
+ // init search results object
+ var searchResults = new SearchResults();
+ // init http object
+ var http = new Http();
+ var html = http.downloadWebpage(strFormat(URL_SEARCH, keyWord, pageIndex, searchResults.getUserLanguage()));
+ // get the search summary
+ var tmp = copyBetween(html, '<td> Dein Ergebnis', '</td>');
+ var summary = "Dein Ergebnis" + copyBetween(tmp, "<span class='sWord'>", "'");
+ var tmp = copyBetween(html, "<span class='pView pnPages'>", "</span>");
+ var summary = summary + " " + tmp
+ var tmp = copyBetween(html, "<span class='pView pnResults'>", "</span>");
+ var summary = summary + " " + tmp
+ searchResults.setSummary(summary);
+ // get results html block
+ var htmlResults = copyBetween(html, HTML_SEARCH_START, HTML_SEARCH_FINISH);
+ // if we found some results then...
+ if (htmlResults != "")
+ {
+ var block = "";
+ // iterate over results
+ while ((block = copyBetween(htmlResults, HTML_SEARCH_SEPARATOR, HTML_SEARCH_SEPARATOR)) != "")
+ {
+ parseResultItem(searchResults, block);
+ htmlResults = strRemove(htmlResults, 0, block.toString().length);
+ }
+ // get last result
+ parseResultItem(searchResults, htmlResults);
+ }
+ // return search results
+ return searchResults;
+}
+
+function parseResultItem(searchResults, html)
+{
+ const VIDEO_URL = "http://www.myvideo.de";
+ // vars
+ var tmp, videoUrl, imageUrl, title, description, duration, rating;
+ // get title and image url
+ tmp = copyBetween(html, "<div class='vThumb'>", '</div>') ;
+ title = copyBetween(tmp, "title='", "'");
+ imageUrl = copyBetween(tmp, "src='", "'");
+ // get video url
+ videoUrl = VIDEO_URL + copyBetween(tmp, "href='", "'");
+ //if (strIndexOf(imageUrl, "default.jpg") == -1) // if is not a "default.jpg"...
+ // imageUrl = copyBetween(tmp, 'thumb="', '"');
+ // get video description
+ tmp = copyBetween(html, "<div class='sCenter vTitle'>", '</div>') ;
+ description = copyBetween(tmp, "<span class='hidden'>", '</span>');
+ // get video duration
+ tmp = copyBetween(html, ' Lnge ', '/span>');
+ duration = convertToSeconds(copyBetween(tmp, "> ", '<'));
+ // get rating
+ rating = getrating(copyBetween(html, 'ratingBox', '</div>'));
+ // add to results list
+ searchResults.addSearchResult(videoUrl, imageUrl, title, description, duration, rating);
+}
+
+function getrating(text)
+{
+ var rating = 0
+ var i = 1
+ while (i < 6)
+ {
+ var part = getToken(text, '<img',i);
+ if (strIndexOf(part,"m_star_red_0.gif") != -1)
+ {
+ rating = rating + 1
+ }
+ if (strIndexOf(part,"m_star_half_0.gif") != -1)
+ {
+ rating = rating + 0.5
+ }
+ i++
+ }
+ return rating;
+}
+
+function convertToSeconds(text)
+{
+ // how many ":" exists?
+ var count = getTokenCount(text, ":");
+ // get mins and seconds
+ var h = new Number(h = count == 3 ? getToken(text, ":", 0) * 3600 : 0);
+ var m = new Number(getToken(text, ":", count - 2) * 60);
+ var s = new Number(getToken(text, ":", count - 1));
+ // convert h:m:s to seconds
+ return h + m + s;
+}
+
+function getVideoServiceIcon()
+{
+ 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,0x66,0x50,0x4c,0x54,0x45,0x3d,0x88,0xe5,0x49,0x8f,0xe7,0x55,
+ 0x97,0xe8,0x61,0x9e,0xea,0x62,0x9e,0xea,0x6e,0xa6,0xec,0x7a,0xad,0xed,0x85,0xb5,
+ 0xee,0x86,0xb5,0xef,0x92,0xbc,0xf0,0x9e,0xc3,0xf2,0x9e,0xc4,0xf2,0xaa,0xcb,0xf4,
+ 0xb6,0xd2,0xf5,0xc2,0xda,0xf7,0xce,0xe1,0xf8,0xda,0xe9,0xfa,0xdb,0xe9,0xfa,0xe7,
+ 0xf0,0xfc,0xf3,0xf8,0xfd,0xff,0x66,0x00,0xff,0x70,0x10,0xff,0x79,0x20,0xff,0x8c,
+ 0x40,0xff,0x96,0x50,0xff,0x9f,0x60,0xff,0xb3,0x80,0xff,0xbc,0x8f,0xff,0xc6,0x9f,
+ 0xff,0xcf,0xaf,0xff,0xd9,0xbf,0xff,0xec,0xe0,0xff,0xf5,0xef,0xff,0xff,0xff,0x48,
+ 0xd7,0xaa,0x42,0x00,0x00,0x00,0x8c,0x49,0x44,0x41,0x54,0x18,0x19,0x05,0xc1,0x09,
+ 0x42,0xc2,0x30,0x14,0x05,0xc0,0x17,0x4a,0x2b,0x01,0x0a,0x4a,0x3e,0x54,0x71,0x9d,
+ 0xfb,0x5f,0xd2,0x99,0x60,0xf4,0x96,0x76,0x1c,0x40,0x18,0xfb,0xec,0xfa,0x69,0xda,
+ 0x0f,0x10,0x96,0x2c,0xe3,0x36,0xac,0x0b,0x88,0xd7,0xec,0xc6,0x5b,0x47,0xbf,0x42,
+ 0xf4,0x9c,0x2d,0xc3,0xb7,0x71,0x80,0x98,0x73,0x33,0xb3,0x3d,0x7e,0x4e,0x10,0x2d,
+ 0xec,0xd8,0xaa,0xde,0x7f,0x11,0x09,0xad,0xdb,0xaa,0xea,0xfe,0x49,0x24,0xf4,0xd8,
+ 0xaa,0xaa,0xea,0x43,0xcc,0xb9,0x19,0x93,0xad,0xaa,0x1e,0x5f,0xc4,0x21,0x2b,0x6c,
+ 0x75,0x7f,0x42,0xac,0x99,0x61,0x7b,0xfe,0xbd,0x40,0x8c,0x96,0x0b,0x38,0x1f,0x21,
+ 0x9c,0xd3,0x2e,0x58,0xdb,0x80,0xe0,0x90,0x4c,0xf3,0x94,0x0b,0x08,0x1c,0x5b,0xb2,
+ 0xbf,0x02,0xff,0xae,0x67,0x16,0x49,0x16,0x8a,0x4e,0x0f,0x00,0x00,0x00,0x00,0x49,
+ 0x45,0x4e,0x44,0xae,0x42,0x60,0x82);
+}
sunporno.patch:
sunporno.js | 111 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 111 insertions(+)
--- NEW FILE sunporno.patch ---
New plugin.
Index: xvst-2.4.1/resources/services/sunporno/sunporno.js
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ xvst-2.4.1/resources/services/sunporno/sunporno.js 2011-10-15 22:37:36.742367015 +0200
@@ -0,0 +1,111 @@
+/*
+*
+* This file is part of xVideoServiceThief,
+* an open-source cross-platform Video service download
+*
+* Copyright (C) 2007 - 2011 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
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with xVideoServiceThief. If not, see <http://www.gnu.org/licenses/>.
+*
+* Contact e-mail: Xesc <xeskuu.xvst(a)gmail.com>
+* Program URL : http://xviservicethief.sourceforge.net/
+*
+*/
+
+function RegistVideoService()
+{
+ this.version = "1.0.0";
+ this.minVersion = "2.0.0a";
+ this.author = "crapmaster & Xesc & Technology 2011";
+ this.website = "http://www.sunporno.com/";
+ this.ID = "sunporno.com";
+ this.caption = "Sunporno";
+ this.adultContent = true;
+ this.musicSite = false;
+}
+
+function getVideoInformation(url)
+{
+ // video information
+ var result = new VideoDefinition();
+ // download webpage
+ var http = new Http();
+ var html = http.downloadWebpage(url);
+ // get video title
+ result.title = copyBetween(html, "<title>", "</title>");
+ // get the xml url
+ var tmpUrl = copyBetween(html, "s1.addVariable('file', '", "');");
+ // get url
+ result.URL=cleanUrl(tmpUrl);
+ // return the video information
+ return result;
+}
+
+function getVideoServiceIcon()
+{
+ 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,0x06,0x00,0x00,0x00,0x1f,0xf3,0xff,
+ 0x61,0x00,0x00,0x00,0x01,0x73,0x52,0x47,0x42,0x00,0xae,0xce,0x1c,0xe9,0x00,0x00,
+ 0x00,0x06,0x62,0x4b,0x47,0x44,0x00,0xff,0x00,0xff,0x00,0xff,0xa0,0xbd,0xa7,0x93,
+ 0x00,0x00,0x00,0x09,0x70,0x48,0x59,0x73,0x00,0x00,0x0b,0x13,0x00,0x00,0x0b,0x13,
+ 0x01,0x00,0x9a,0x9c,0x18,0x00,0x00,0x00,0x07,0x74,0x49,0x4d,0x45,0x07,0xdb,0x0a,
+ 0x09,0x07,0x18,0x05,0x74,0xab,0x6b,0x34,0x00,0x00,0x02,0xc4,0x49,0x44,0x41,0x54,
+ 0x38,0xcb,0x4d,0x93,0xcf,0x6f,0x94,0x65,0x10,0xc7,0x3f,0x33,0xef,0xb3,0xfb,0xee,
+ 0xbe,0xdd,0x52,0xb3,0xb4,0x21,0x24,0x52,0x63,0x02,0xe5,0x87,0x07,0x13,0xb0,0x17,
+ 0x0f,0x10,0x13,0xbd,0xd4,0xe0,0x45,0x4f,0x1e,0x7a,0xd1,0x9b,0xff,0x85,0x47,0x2e,
+ 0x9e,0xb8,0x90,0x9e,0x34,0xd1,0x93,0x81,0xd0,0xd8,0x13,0x07,0x16,0x3c,0x10,0x10,
+ 0x09,0x89,0x31,0x29,0xd4,0x06,0x6d,0x17,0x0b,0x4b,0xda,0xa5,0x76,0x7f,0x3e,0xef,
+ 0x3c,0xe3,0x61,0x6b,0xe2,0x1c,0x66,0xbe,0x99,0xef,0xe7,0x7b,0x9a,0x0c,0x23,0x77,
+ 0xf7,0x91,0x79,0xf2,0xc3,0x4a,0xee,0x6e,0xee,0xc3,0x76,0xc7,0xaf,0x2f,0x2e,0xfb,
+ 0xf5,0xc5,0x65,0x1f,0xb6,0x3b,0xee,0x76,0xe8,0xfd,0x37,0x46,0xe6,0x23,0x77,0xd7,
+ 0xd2,0x4b,0x08,0x8a,0xe1,0x60,0x89,0x52,0x20,0x25,0x63,0xb7,0xdb,0x25,0xf6,0x87,
+ 0xc4,0xfe,0x90,0xdd,0x6e,0x97,0x94,0x8c,0x52,0x00,0x4b,0x13,0x36,0x28,0xa5,0x97,
+ 0x68,0x41,0xc0,0xad,0x24,0x24,0x88,0xdb,0xaf,0x20,0x19,0x1e,0x32,0x24,0x1a,0x0d,
+ 0x53,0x1a,0xa6,0x48,0x9c,0xec,0x48,0x46,0xdc,0x7e,0x45,0x48,0xe0,0x56,0x52,0x10,
+ 0x50,0x00,0x11,0xa1,0xd3,0x7a,0xc4,0xed,0x2b,0x2b,0x6c,0xdf,0xbc,0x8b,0x8f,0x23,
+ 0x21,0x04,0xa2,0x95,0x44,0x2b,0x09,0x21,0xe0,0xe3,0xc8,0xf6,0xcd,0xbb,0xdc,0xbe,
+ 0xb2,0x42,0xa7,0xf5,0x08,0x11,0x01,0x20,0x8c,0xdd,0xf0,0xdd,0x7d,0xee,0x5f,0xfd,
+ 0x81,0xec,0xf7,0x36,0x0f,0x7e,0xfb,0x83,0xe3,0xef,0xbf,0x4b,0x5e,0xaf,0x11,0x8b,
+ 0x0a,0x00,0x79,0xbd,0x86,0x75,0x0f,0x78,0xf0,0xcd,0x77,0x4c,0x77,0x06,0xdc,0x7f,
+ 0xb1,0xc7,0x87,0xef,0xbc,0x8d,0xcc,0x1e,0x41,0xab,0xae,0xb4,0x5b,0x0f,0x19,0xac,
+ 0x6f,0xe1,0x96,0x98,0x5f,0x38,0x89,0x99,0x11,0x63,0x24,0xa5,0x44,0x4a,0x89,0x18,
+ 0x23,0x66,0xc6,0xfc,0xc2,0x49,0xdc,0x12,0x83,0xf5,0x2d,0xda,0xad,0x87,0x54,0x5d,
+ 0x51,0x10,0x36,0xd7,0x7e,0xa6,0xe2,0x82,0x9d,0x68,0xf2,0xe6,0x67,0x1f,0x50,0xcc,
+ 0x36,0x91,0x22,0xa7,0x54,0x28,0x15,0xa4,0xc8,0x29,0x66,0x27,0x9e,0x9d,0x68,0x52,
+ 0xf1,0x49,0x06,0x84,0x30,0xcc,0x20,0xbe,0xdc,0x43,0x44,0xc8,0x8f,0xce,0xd0,0xbc,
+ 0x70,0x06,0x54,0xa9,0x1f,0x6b,0x72,0xfe,0x93,0x8f,0x00,0xa8,0x1f,0x6b,0x82,0x2a,
+ 0xcd,0x0b,0x67,0xc8,0x8f,0xce,0x30,0x78,0xd1,0x25,0xbe,0xdc,0x63,0x98,0x41,0x08,
+ 0xc0,0xd0,0x8d,0xaa,0x83,0x8a,0x90,0x15,0x39,0x28,0xe4,0x59,0xce,0xe9,0xaf,0xbf,
+ 0x00,0xc0,0x0f,0x5b,0x56,0xe4,0x13,0xc6,0x27,0x99,0x00,0x68,0x06,0xd4,0xa7,0x1b,
+ 0xa8,0x39,0xb2,0x3f,0x60,0xf0,0x78,0x13,0x13,0x90,0xe4,0x94,0x40,0xc9,0x44,0x9b,
+ 0xc0,0xe0,0xf1,0x26,0xb2,0x3f,0x40,0xcd,0xa9,0x4f,0x37,0xc8,0x00,0x95,0x04,0x73,
+ 0x8b,0xe7,0x18,0xa9,0xb3,0xd3,0x7e,0xce,0xb3,0x5b,0xf7,0x18,0x1d,0xf4,0x40,0x04,
+ 0x4d,0x09,0x4d,0x09,0x44,0x18,0x1d,0xf4,0x78,0x76,0xeb,0x1e,0x3b,0xed,0xe7,0x8c,
+ 0xd4,0x99,0x5b,0x3c,0x87,0x24,0xd0,0x81,0x26,0xce,0x2e,0x5d,0x22,0xaf,0xd7,0xa8,
+ 0xa2,0x6c,0xac,0xb6,0xd8,0xb8,0x76,0x83,0xde,0xd6,0x0e,0x2a,0x8a,0x8a,0xd2,0xdb,
+ 0xda,0x61,0xe3,0xda,0x0d,0x36,0x56,0x5b,0x54,0x51,0xf2,0x7a,0x8d,0xb3,0x4b,0x97,
+ 0x18,0x68,0x42,0x3c,0xba,0x53,0x46,0xfe,0x5a,0x59,0xe5,0x97,0xef,0x57,0xc9,0xfe,
+ 0x7e,0x8d,0x17,0x55,0x9a,0xe7,0x4f,0x93,0xba,0x3d,0x00,0xf4,0x8d,0x29,0x76,0x7f,
+ 0x5d,0x47,0xfa,0x63,0xec,0xf8,0x0c,0xef,0x7d,0x7e,0x99,0xf9,0x2f,0x2f,0x43,0xa8,
+ 0x20,0x7d,0x4f,0x2e,0x08,0xf2,0x4f,0x8f,0xa7,0x57,0x7f,0xe4,0xc9,0xda,0x1d,0x7c,
+ 0xbf,0x4f,0x4c,0x46,0x8d,0x0c,0x80,0x21,0x46,0x45,0x33,0xe4,0x48,0xc1,0xc2,0xd2,
+ 0x45,0x4e,0x7d,0xf5,0x29,0x3e,0x3d,0x85,0xe3,0x48,0xd7,0xdd,0x67,0xa2,0x61,0x95,
+ 0x0c,0xdd,0x3d,0xe0,0xc9,0xda,0x1d,0x9e,0x7e,0xfb,0x13,0xfe,0x67,0x87,0xfe,0x54,
+ 0x00,0xa0,0xe8,0x95,0xc8,0x5b,0x73,0x9c,0x5a,0xfe,0x98,0x85,0xa5,0x8b,0xa4,0x66,
+ 0x83,0x2c,0x1a,0xaf,0x2b,0x19,0xe2,0xe3,0xe4,0xa8,0x60,0xd9,0xe4,0x5c,0x02,0x64,
+ 0x0e,0x00,0x91,0x04,0x40,0x65,0xf2,0x32,0x98,0xfc,0x8f,0x31,0x20,0x39,0xff,0x02,
+ 0xd5,0x5f,0x8c,0x14,0xcf,0x39,0xc3,0xe2,0x00,0x00,0x00,0x00,0x49,0x45,0x4e,0x44,
+ 0xae,0x42,0x60,0x82);
+}
wat.tv.patch:
wat.js | 65 ++++++++++++++++++++++++++++++++++++++++++++++++-----------------
1 file changed, 48 insertions(+), 17 deletions(-)
--- NEW FILE wat.tv.patch ---
# downgrade the version? xvst wants to install this "update". so make it happy.
Index: xvst-2.5.1/resources/services/wat/wat.js
===================================================================
--- xvst-2.5.1.orig/resources/services/wat/wat.js 2014-01-10 20:26:06.229631692 +0100
+++ xvst-2.5.1/resources/services/wat/wat.js 2014-01-10 20:47:15.165593944 +0100
@@ -3,7 +3,7 @@
* This file is part of xVideoServiceThief,
* an open-source cross-platform Video service download
*
-* Copyright (C) 2007 - 2014 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 2014";
+ 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=\"titre\">", "</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);
}
--- NEW FILE xvst.desktop ---
[Desktop Entry]
Type=Application
Name=xVideoServiceThief
GenericName=Video Downloader
GenericName[de]=Video-Downloader
GenericName[cs]=Stahování videí
Comment=Download videos and convert it
Comment[de]=Videos herunterladen und konvertieren
Comment[cs]=Nástroj pro stahování a konvertování videí z různých portálů
Icon=xvst
Exec=xvst
Terminal=false
StartupNotify=false
Categories=Qt;AudioVideo;Audio;Video;
--- NEW FILE xvst.spec ---
%global commit cbfafe49f7ba1c85d4dcf51be17b49b035210412
%global shortcommit %(c=%{commit}; echo ${c:0:7})
%global gitdate 20140804
Summary: Downloading your favourite video clips from a lot of websites
Name: xvst
Version: 2.5.2
Release: 4.%{gitdate}git%{shortcommit}%{?dist}
License: GPLv3+
URL: https://github.com/xVST/xVideoServiceThief
# wget https://github.com/xVST/xVideoServiceThief/archive/cbfafe49f7ba1c85d4dcf5...
Source0: https://github.com/xVST/xVideoServiceThief/archive/%{commit}/%{name}-%{ve...
Source1: %{name}.desktop
Patch0: beeg.patch
Patch1: chilloutzone.patch
Patch2: disable_update.patch
Patch3: keezmovies.patch
Patch4: myvideo.patch
Patch5: sunporno.patch
Patch6: wat.tv.patch
BuildRequires: desktop-file-utils
BuildRequires: qt5-qtbase-devel
BuildRequires: qt5-qtwebkit-devel
BuildRequires: qt5-qtscript-devel
BuildRequires: qt5-qttools-devel
BuildRequires: librtmp-devel
Requires: ffmpeg
%description
xVideoServiceThief (a.k.a xVST) is a tool for downloading your favourite
video clips from a lot of video websites (currently supports 93 websites
and increasing!).
xVideoServiceThief also provide you the ability to convert each video
in most popular formats: AVI, MPEG1, MPEG2, WMV, MP4, 3GP, MP3 file formats.
%prep
%setup -qn xVideoServiceThief-%{commit}
# removed bundled rtmpdump
rm -rf src/rtmpdump
# Patches provided by getdeb.net. Add/fix download sites and turns off
# automatic updates.
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
%patch5 -p1
%patch6 -p1
# Fix path names and end-of-line encoding.
sed -i "s|getApplicationPath()\ +\ \"|\"/usr/share/%{name}|g" src/options.cpp
sed -i 's/\r//' "how to compile.txt"
chmod 0644 resources/services/youporngay/youporngay.js
chmod 0644 resources/services/tube8/tube8.js
chmod 0644 resources/services/hardsextube/hardsextube.js
%build
# Creat translation files.
lrelease-qt5 resources/translations/*.ts
rm -f resources/translations/template_for_new_translations.qm
%{qmake_qt5}
make %{?_smp_mflags}
%install
install -d -m 0755 %{buildroot}%{_datadir}/%{name}/{plugins,languages}
find resources/services -name "*.js" \
-exec cp -dpR {} %{buildroot}%{_datadir}/%{name}/plugins \;
install -m 0644 resources/translations/*.qm \
%{buildroot}%{_datadir}/%{name}/languages
install -m 0644 resources/translations/definitions/*.language \
%{buildroot}%{_datadir}/%{name}/languages
install -Dm755 bin/%{name} %{buildroot}%{_bindir}/%{name}
install -Dm644 %{SOURCE1} %{buildroot}%{_datadir}/applications/%{name}.desktop
install -Dm644 resources/images/InformationLogo.png %{buildroot}%{_datadir}/pixmaps/%{name}.png
%check
desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop
%post
update-desktop-database &> /dev/null || :
%postun
update-desktop-database &> /dev/null || :
%files
%license GPL.txt
%doc README.md resources/{changelog.txt,service_list.html}
%{_bindir}/%{name}
%{_datadir}/applications/%{name}.desktop
%{_datadir}/pixmaps/%{name}.png
%dir %{_datadir}/%{name}/
%{_datadir}/%{name}/plugins/
%{_datadir}/%{name}/languages/*language
%{_datadir}/%{name}/languages/*qm
%changelog
* Sat Mar 21 2015 Martin Gansser <linux4martin(a)gmx.de> 2.5.2-4.20140804gitcbfafe4
- dropped macro %%find_lang because it doesn't work in this certain case
- dropped macro %%exclude from %%{_datadir}/%%{name}/languages/*qm
* Fri Mar 20 2015 Martin Gansser <linux4martin(a)gmx.de> 2.5.2-3.20140804gitcbfafe4
- dropped %%Provides tag
- added %%find_lang macro to find .qm files
* Sun Mar 08 2015 Martin Gansser <linux4martin(a)gmx.de> 2.5.2-2.20140804gitcbfafe4
- removed bundled rtmpdump
- added BR librtmp-devel
* Sat Mar 07 2015 Martin Gansser <linux4martin(a)gmx.de> 2.5.2-1.20140804gitcbfafe4
- Inital build for Fedora
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/xvst/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 6 Apr 2015 21:41:36 -0000 1.1
+++ .cvsignore 7 Apr 2015 15:39:29 -0000 1.2
@@ -0,0 +1 @@
+xvst-2.5.2-cbfafe4.tar.gz
Index: sources
===================================================================
RCS file: /cvs/free/rpms/xvst/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 6 Apr 2015 21:41:37 -0000 1.1
+++ sources 7 Apr 2015 15:39:29 -0000 1.2
@@ -0,0 +1 @@
+5174cdb3d48c530bead9afaa67986624 xvst-2.5.2-cbfafe4.tar.gz
9 years
rpms/akmods/devel akmods, 1.12, 1.13 akmods-shutdown.service, 1.1, 1.2 akmods.spec, 1.19, 1.20 akmodsbuild, 1.4, 1.5
by Richard Shaw
Author: hobbes1069
Update of /cvs/free/rpms/akmods/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv30795
Modified Files:
akmods akmods-shutdown.service akmods.spec akmodsbuild
Log Message:
* Wed Apr 4 2015 Richard Shaw <hobbes1069(a)gmail.com> - 0.5.2-1
- Fix temporary directory creation when TMPDIR environment variable is set,
fixes BZ#2596.
- Update systemd scripts to use macros.
- Fix akmods run on shutdown systemd unit file, fixes BZ#3503.
Index: akmods
===================================================================
RCS file: /cvs/free/rpms/akmods/devel/akmods,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- akmods 16 Nov 2014 14:29:05 -0000 1.12
+++ akmods 7 Apr 2015 13:32:05 -0000 1.13
@@ -109,7 +109,7 @@
create_tmpdir()
{
- if ! tmpdir="$(mktemp -d -t ${myprog}.XXXXXXXX)/" ; then
+ if ! tmpdir="$(mktemp -d -p /tmp ${myprog}.XXXXXXXX)/" ; then
akmods_echo 2 1 "ERROR: failed to create tmpdir."
akmods_echo 2 1 --failure; return 1
fi
Index: akmods-shutdown.service
===================================================================
RCS file: /cvs/free/rpms/akmods/devel/akmods-shutdown.service,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- akmods-shutdown.service 22 Dec 2012 16:02:20 -0000 1.1
+++ akmods-shutdown.service 7 Apr 2015 13:32:05 -0000 1.2
@@ -6,7 +6,8 @@
[Service]
Type=oneshot
RemainAfterExit=yes
-ExecStart=-/usr/sbin/akmods --from-init
+ExecStart=/bin/true
+ExecStop=-/usr/sbin/akmods --from-init
[Install]
WantedBy=multi-user.target
Index: akmods.spec
===================================================================
RCS file: /cvs/free/rpms/akmods/devel/akmods.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- akmods.spec 16 Nov 2014 14:29:05 -0000 1.19
+++ akmods.spec 7 Apr 2015 13:32:05 -0000 1.20
@@ -1,11 +1,11 @@
Name: akmods
-Version: 0.5.1
-Release: 4%{?dist}
+Version: 0.5.2
+Release: 1%{?dist}
Summary: Automatic kmods build and install tool
-Group: System Environment/Kernel
License: MIT
URL: http://rpmfusion.org/Packaging/KernelModules/Akmods
+
Source0: akmods
Source1: akmods.1
Source2: akmodsbuild
@@ -38,10 +38,10 @@
Requires(pre): shadow-utils
# systemd unit requirements.
-BuildRequires: systemd-units
-Requires(post): systemd-units
-Requires(preun): systemd-units
-Requires(postun): systemd-units
+BuildRequires: systemd
+Requires(post): systemd
+Requires(preun): systemd
+Requires(postun): systemd
%description
@@ -94,13 +94,11 @@
fi
%preun
-if [ $1 -eq 0 ] ; then
- # Package removal, not upgrade
- /bin/systemctl --no-reload disable akmods.service > /dev/null 2>&1 || :
- /bin/systemctl stop akmods.service > /dev/null 2>&1 || :
- /bin/systemctl --no-reload disable akmods-shutdown.service > /dev/null 2>&1 || :
- /bin/systemctl stop akmods-shutdown.service > /dev/null 2>&1 || :
-fi
+%systemd_preun akmods.service
+%systemd_preun akmods-shutdown.service
+
+%postun
+%systemd_postun
%files
@@ -116,6 +114,12 @@
%changelog
+* Wed Apr 4 2015 Richard Shaw <hobbes1069(a)gmail.com> - 0.5.2-1
+- Fix temporary directory creation when TMPDIR environment variable is set,
+ fixes BZ#2596.
+- Update systemd scripts to use macros.
+- Fix akmods run on shutdown systemd unit file, fixes BZ#3503.
+
* Sun Nov 16 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 0.5.1-4
- Fix akmods on armhfp - rfbz#3117
- Use yum instead of rpm to install packages - rfbz#3350
Index: akmodsbuild
===================================================================
RCS file: /cvs/free/rpms/akmods/devel/akmodsbuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- akmodsbuild 16 Nov 2014 14:10:31 -0000 1.4
+++ akmodsbuild 7 Apr 2015 13:32:05 -0000 1.5
@@ -88,7 +88,7 @@
## preparations
# tmpdir
- if ! tmpdir="$(mktemp -d -t ${myprog}.XXXXXXXX)" ; then
+ if ! tmpdir="$(mktemp -d -p /tmp ${myprog}.XXXXXXXX)" ; then
echo "ERROR: Could create tempdir."
exit 1
fi
9 years
rpms/openshot/F-20 openshot.png,NONE,1.1 openshot.spec,1.8,1.9
by Richard Shaw
Author: hobbes1069
Update of /cvs/free/rpms/openshot/F-20
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv30334
Modified Files:
openshot.spec
Added Files:
openshot.png
Log Message:
* Mon Apr 6 2015 Richard Shaw <hobbes1069(a)gmail.com> - 1.4.3-3
- Fix broken icon file (BZ#3546).
- Add ladspa as a install requirement (BZ#3472).
Index: openshot.spec
===================================================================
RCS file: /cvs/free/rpms/openshot/F-20/openshot.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- openshot.spec 26 Oct 2012 18:18:23 -0000 1.8
+++ openshot.spec 7 Apr 2015 13:12:49 -0000 1.9
@@ -1,6 +1,6 @@
Name: openshot
Version: 1.4.3
-Release: 1%{?dist}
+Release: 3%{?dist}
Summary: A GTK based non-linear video editor
Group: Applications/Multimedia
@@ -11,6 +11,8 @@
URL: http://www.openshotvideo.com/
Source0: http://launchpad.net/openshot/1.4/%{version}/+download/openshot-%{version...
+Source1: openshot.png
+
Patch0: openshot-1.4.0-use_mlt-melt.diff
Patch1: openshot-1.4.0-doc-install.diff
@@ -21,9 +23,11 @@
BuildRequires: python-devel
# Resize icon
BuildRequires: ImageMagick
+BuildRequires: exiv2
Requires: mlt
Requires: mlt-python
+Requires: ladspa
Requires: notify-python
Requires: pygoocanvas
Requires: pygtk2-libglade
@@ -85,11 +89,7 @@
%{buildroot}%{_datadir}/icons/hicolor/48x48/apps/
mv %{buildroot}%{_datadir}/pixmaps/%{name}.svg \
%{buildroot}%{_datadir}/icons/hicolor/scalable/apps/
-convert -resize 48x48 -strip \
- %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg \
- %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
-# Take more drastic action because -strip doesn't seem to work in F15
-sed -i 's|%{buildroot}||g' %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
+cp -p %{SOURCE1} %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/
# modify find-lang.sh to deal with gettext .mo files under
# openshot/locale
@@ -148,6 +148,13 @@
%changelog
+* Mon Apr 6 2015 Richard Shaw <hobbes1069(a)gmail.com> - 1.4.3-3
+- Fix broken icon file (BZ#3546).
+- Add ladspa as a install requirement (BZ#3472).
+
+* Sun Aug 31 2014 Sérgio Basto <sergio(a)serjux.com> - 1.4.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
* Fri Oct 26 2012 Richard Shaw <hobbes1069(a)gmail.com> - 1.4.3-1
- Update to latest upstream release.
9 years
rpms/openshot/devel openshot.png,NONE,1.1
by Richard Shaw
Author: hobbes1069
Update of /cvs/free/rpms/openshot/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv29984
Added Files:
openshot.png
Log Message:
Add icon file to cvs.
9 years
rpms/openshot/devel openshot.spec,1.9,1.10
by Richard Shaw
Author: hobbes1069
Update of /cvs/free/rpms/openshot/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv19708
Modified Files:
openshot.spec
Log Message:
* Mon Apr 6 2015 Richard Shaw <hobbes1069(a)gmail.com> - 1.4.3-3
- Fix broken icon file (BZ#3546).
- Add ladspa as a install requirement (BZ#3472).
Index: openshot.spec
===================================================================
RCS file: /cvs/free/rpms/openshot/devel/openshot.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- openshot.spec 31 Aug 2014 12:31:01 -0000 1.9
+++ openshot.spec 7 Apr 2015 00:30:19 -0000 1.10
@@ -1,6 +1,6 @@
Name: openshot
Version: 1.4.3
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: A GTK based non-linear video editor
Group: Applications/Multimedia
@@ -11,6 +11,8 @@
URL: http://www.openshotvideo.com/
Source0: http://launchpad.net/openshot/1.4/%{version}/+download/openshot-%{version...
+Source1: openshot.png
+
Patch0: openshot-1.4.0-use_mlt-melt.diff
Patch1: openshot-1.4.0-doc-install.diff
@@ -21,9 +23,11 @@
BuildRequires: python-devel
# Resize icon
BuildRequires: ImageMagick
+BuildRequires: exiv2
Requires: mlt
Requires: mlt-python
+Requires: ladspa
Requires: notify-python
Requires: pygoocanvas
Requires: pygtk2-libglade
@@ -85,11 +89,7 @@
%{buildroot}%{_datadir}/icons/hicolor/48x48/apps/
mv %{buildroot}%{_datadir}/pixmaps/%{name}.svg \
%{buildroot}%{_datadir}/icons/hicolor/scalable/apps/
-convert -resize 48x48 -strip \
- %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg \
- %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
-# Take more drastic action because -strip doesn't seem to work in F15
-sed -i 's|%{buildroot}||g' %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
+cp -p %{SOURCE1} %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/
# modify find-lang.sh to deal with gettext .mo files under
# openshot/locale
@@ -148,6 +148,10 @@
%changelog
+* Mon Apr 6 2015 Richard Shaw <hobbes1069(a)gmail.com> - 1.4.3-3
+- Fix broken icon file (BZ#3546).
+- Add ladspa as a install requirement (BZ#3472).
+
* Sun Aug 31 2014 Sérgio Basto <sergio(a)serjux.com> - 1.4.3-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
9 years