rpms/VirtualBox-kmod/devel VirtualBox-kmod.spec,1.7,1.8
by Sérgio M. Basto
Author: sergiomb
Update of /cvs/free/rpms/VirtualBox-kmod/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv9809
Modified Files:
VirtualBox-kmod.spec
Log Message:
* Sun Sep 23 2012 Sérgio Basto <sergio(a)serjux.com> - 4.2.0-2
- Build with newest VirtualBox-kmodsrc (4.2.0-3).
Index: VirtualBox-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-kmod/devel/VirtualBox-kmod.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- VirtualBox-kmod.spec 23 Sep 2012 14:57:35 -0000 1.7
+++ VirtualBox-kmod.spec 25 Dec 2012 03:32:42 -0000 1.8
@@ -12,15 +12,15 @@
#global prerel RC4
%global prereltag %{?prerel:_%(awk 'BEGIN {print toupper("%{prerel}")}')}
-%global vboxrel 3
+%global vboxrel 1
%global vboxreltag %{?vboxrel:-%{vboxrel}}
# Allow only root to access vboxdrv regardless of the file mode
# use only for debugging!
%bcond_without hardening
Name: VirtualBox-kmod
-Version: 4.2.0
-Release: 2%{?prerel:.%{prerel}}%{?dist}
+Version: 4.2.6
+Release: 1%{?prerel:.%{prerel}}%{?dist}
Summary: Kernel module for VirtualBox
Group: System Environment/Kernel
11 years, 4 months
rpms/VirtualBox/F-18 VirtualBox-4.2.4-no-bundles.patch, NONE, 1.1 VirtualBox-4.1.20-x113.patch, 1.2, 1.3
by Sérgio M. Basto
Author: sergiomb
Update of /cvs/free/rpms/VirtualBox/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv9626
Modified Files:
VirtualBox-4.1.20-x113.patch
Added Files:
VirtualBox-4.2.4-no-bundles.patch
Log Message:
* Mon Dec 24 2012 Sérgio Basto <sergio(a)serjux.com> - 4.2.4-1
- New upstream release.
- Fix some changelog dates.
VirtualBox-4.2.4-no-bundles.patch:
Config.kmk | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
--- NEW FILE VirtualBox-4.2.4-no-bundles.patch ---
--- ./Config.kmk.libcxx 2012-10-26 17:23:13.000000000 +0100
+++ ./Config.kmk 2012-11-24 14:46:31.187664914 +0000
@@ -2587,26 +2587,25 @@ VBOXLNX32GUEST_SUFF_LIB = .a
# SDKs for external libraries.
#
SDK_VBOX_LIBXML2 = .
-SDK_VBOX_LIBXML2_INCS ?= $(PATH_ROOT)/src/libs/libxml2-2.6.31/include
+SDK_VBOX_LIBXML2_INCS ?= /usr/include/libxml2
SDK_VBOX_LIBXML2_DEFS ?= _REENTRANT
SDK_VBOX_LIBXML2_DEFS.win += WIN32 _WINDOWS _MBCS
# note: no linking to LIB here, we do that explicitly in src/VBox/Runtime/Makefile.kmk to link
# libxml against VBoxRT
SDK_VBOX_LIBPNG = .
-SDK_VBOX_LIBPNG_INCS ?= $(PATH_ROOT)/src/libs/libpng-1.2.8
+SDK_VBOX_LIBPNG_INCS ?= /usr/include/libpng15
SDK_VBOX_LIBPNG_LIBS ?= $(PATH_STAGE_LIB)/VBox-libpng$(VBOX_SUFF_LIB)
SDK_VBOX_ZLIB = .
if1of ($(KBUILD_TARGET), os2 solaris win)
- SDK_VBOX_ZLIB_INCS ?= $(PATH_ROOT)/src/libs/zlib-1.2.6
+ SDK_VBOX_ZLIB_INCS ?= /usr/include/
SDK_VBOX_ZLIB_LIBS ?= $(PATH_STAGE_LIB)/VBox-zlib$(VBOX_SUFF_LIB)
else
SDK_VBOX_ZLIB_INCS ?=
SDK_VBOX_ZLIB_LIBS ?= z
SDK_VBOX_ZLIB_DEFS.linux ?= _LARGEFILE64_SOURCE
endif
-
SDK_VBOX_OPENSSL = Only for VBoxRT and/or statically linked programs.
SDK_VBOX_OPENSSL_VBOX_DEFAULT_INCS := $(PATH_OUT)/obj/crypto-headers/include
SDK_VBOX_OPENSSL_INCS ?= $(SDK_VBOX_OPENSSL_VBOX_DEFAULT_INCS)
VirtualBox-4.1.20-x113.patch:
vboxvideo.c | 55 +++++++++++++++++++++++--------------------------------
vboxvideo.h | 2 +-
vboxvideo_dri.c | 4 ++--
3 files changed, 26 insertions(+), 35 deletions(-)
Index: VirtualBox-4.1.20-x113.patch
===================================================================
RCS file: /cvs/free/rpms/VirtualBox/F-18/VirtualBox-4.1.20-x113.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- VirtualBox-4.1.20-x113.patch 25 Dec 2012 01:38:33 -0000 1.2
+++ VirtualBox-4.1.20-x113.patch 25 Dec 2012 03:28:52 -0000 1.3
@@ -1,4 +1,4 @@
-X.org 1.13 patch , not in use, just stay for references.
+X.org 1.13 patch , not in use, stay just for references.
Reference:
http://www.mail-archive.com/xorg-devel@lists.x.org/msg30282.html
[PATCH 01/19] xserver: remove index from CloseScreen (API/ABI breakage) Dave Airlie
11 years, 4 months
rpms/VirtualBox/F-18 .cvsignore, 1.41, 1.42 VirtualBox-4.1.20-x113.patch, 1.1, 1.2 VirtualBox.spec, 1.24, 1.25 sources, 1.41, 1.42
by Sérgio M. Basto
Author: sergiomb
Update of /cvs/free/rpms/VirtualBox/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv24280
Modified Files:
.cvsignore VirtualBox-4.1.20-x113.patch VirtualBox.spec
sources
Log Message:
* Mon Dec 24 2012 Sérgio Basto <sergio(a)serjux.com> - 4.2.4-1
- New upstream release.
- Fix some changelog dates.
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/VirtualBox/F-18/.cvsignore,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- .cvsignore 28 Oct 2012 16:54:57 -0000 1.41
+++ .cvsignore 25 Dec 2012 01:38:33 -0000 1.42
@@ -1 +1 @@
-VirtualBox-4.2.4.tar.bz2
+VirtualBox-4.2.6.tar.bz2
VirtualBox-4.1.20-x113.patch:
vboxvideo.c | 55 +++++++++++++++++++++++--------------------------------
vboxvideo.h | 2 +-
vboxvideo_dri.c | 4 ++--
3 files changed, 26 insertions(+), 35 deletions(-)
Index: VirtualBox-4.1.20-x113.patch
===================================================================
RCS file: /cvs/free/rpms/VirtualBox/F-18/VirtualBox-4.1.20-x113.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- VirtualBox-4.1.20-x113.patch 8 Sep 2012 02:08:19 -0000 1.1
+++ VirtualBox-4.1.20-x113.patch 25 Dec 2012 01:38:33 -0000 1.2
@@ -1,4 +1,4 @@
-X.org 1.13 patch
+X.org 1.13 patch , not in use, just stay for references.
Reference:
http://www.mail-archive.com/xorg-devel@lists.x.org/msg30282.html
[PATCH 01/19] xserver: remove index from CloseScreen (API/ABI breakage) Dave Airlie
Index: VirtualBox.spec
===================================================================
RCS file: /cvs/free/rpms/VirtualBox/F-18/VirtualBox.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- VirtualBox.spec 28 Oct 2012 16:51:01 -0000 1.24
+++ VirtualBox.spec 25 Dec 2012 01:38:33 -0000 1.25
@@ -13,8 +13,20 @@
#global prerel RC4
%global prereltag %{?prerel:_%(awk 'BEGIN {print toupper("%{prerel}")}')}
+#if 0%{?fedora} < 20
+%global enable_webservice 1
+#else
+#global enable_webservice 0
+#endif
+
+%if 0%{?fedora} < 18
+%global enable_docs 1
+%else
+%global enable_docs 0
+%endif
+
Name: VirtualBox
-Version: 4.2.4
+Version: 4.2.6
Release: 1%{?prerel:.%{prerel}}%{?dist}
Summary: A general-purpose full virtualizer for PC hardware
@@ -43,6 +55,7 @@
Patch23: VirtualBox-4.2.0-mesa.patch
Patch24: VirtualBox-4.2.0-VBoxGuestLib.patch
Patch25: VirtualBox-4.2.0-xorg111.patch
+Patch26: VirtualBox-4.2.4-no-bundles.patch
%if 0%{?fedora} < 16
BuildRequires: kBuild >= 0.1.98
@@ -63,7 +76,12 @@
BuildRequires: mkisofs
BuildRequires: java-devel >= 1.6
BuildRequires: /usr/bin/pdflatex
+BuildRequires: boost-devel
+#BuildRequires: liblzf-devel
+BuildRequires: libxml2-devel
BuildRequires: libpng-devel
+BuildRequires: zlib-devel
+BuildRequires: device-mapper-devel
#BuildRequires: glibc(x86-32) glibc-devel(x86-32) libstdc++(x86-32)
#BuildRequires: glibc.i686 glibc-devel.i686 libstdc++.i686
#BuildRequires: /usr/lib/libc.so
@@ -195,6 +213,8 @@
%patch25 -p1 -b .xorg111
%endif
+%patch26 -p1 -b .nobundles
+
# Remove prebuilt binary tools
%if 0%{?fedora} < 16
rm -rf kBuild
@@ -204,18 +224,29 @@
# Remove some bundle X11 sources.
rm -rf src/VBox/Additions/x11/x11include
rm -rf src/VBox/Additions/x11/x11stubs
+rm -rf src/libs/boost-1.37.0/
+#rm -rf src/libs/liblzf-3.4/
+rm -rf src/libs/libxml2-2.6.31/
+rm -rf src/libs/libpng-1.2.8/
+rm -rf src/libs/zlib-1.2.6/
# CRLF->LF
sed -i 's/\r//' COPYING
+# Testings
+#for S in doc/manual/fr_FR/*xml
+#do
+# sed -i 's/[&][a-zA-Z0-9]\{2,5\}[;]/ /g' $S
+#done
%build
./configure --disable-kmods \
-%if 0%{?fedora} > 17
- --disable-docs
+%if %{enable_webservice}
+ --enable-webservice \
%endif
-%if 0%{?fedora} < 18
- --enable-webservice
+%if %{enable_docs}
+%else
+ --disable-docs \
%endif
#--disable-java
@@ -274,7 +305,7 @@
ln -s VBox $RPM_BUILD_ROOT%{_bindir}/vboxheadless
ln -s VBox $RPM_BUILD_ROOT%{_bindir}/VBoxBalloonCtrl
ln -s VBox $RPM_BUILD_ROOT%{_bindir}/vboxballoonctrl
-%if 0%{?fedora} < 18
+%if %{enable_webservice}
ln -s VBox $RPM_BUILD_ROOT%{_bindir}/vboxwebsrv
%endif
ln -s VBox $RPM_BUILD_ROOT%{_bindir}/VBoxBFE
@@ -296,13 +327,6 @@
obj/bin/V*.r0 \
obj/bin/VBoxEFI*.fd
-# Documentation
-%if 0%{?fedora} < 18
-install -p -m 0644 -t $RPM_BUILD_ROOT%{_libdir}/virtualbox \
- obj/bin/UserManual.pdf
-%endif
-
-
# Executables
install -p -m 0755 -t $RPM_BUILD_ROOT%{_libdir}/virtualbox \
obj/bin/VBoxHeadless \
@@ -318,7 +342,7 @@
obj/bin/VBoxTestOGL \
obj/bin/VBoxExtPackHelperApp \
obj/bin/VBoxBalloonCtrl \
-%if 0%{?fedora} < 18
+%if %{enable_webservice}
obj/bin/vboxwebsrv \
obj/bin/webtest \
%endif
@@ -440,11 +464,6 @@
/usr/bin/update-desktop-database &>/dev/null || :
/usr/bin/update-mime-database %{_datadir}/mime &>/dev/null || :
-# Web service
-# Run these because the SysV package being removed won't do them
-/sbin/chkconfig --del vboxweb-service >/dev/null 2>&1 || :
-/bin/systemctl daemon-reload >/dev/null 2>&1 || :
-
# Assign USB devices
if /sbin/udevadm control --reload-rules >/dev/null 2>&1
then
@@ -453,7 +472,8 @@
systemctl restart udev-trigger.service
systemctl restart udev-settle.service
fi
-
+# should be in kmod package, not here
+/bin/systemctl try-restart fedora-loadmodules.service >/dev/null 2>&1 || :
%preun
if [ $1 -eq 0 ] ; then
@@ -462,8 +482,14 @@
/bin/systemctl stop vboxweb.service > /dev/null 2>&1 || :
fi
-
%postun
+if [ $1 -eq 0 ] ; then
+ # Package upgrade, not uninstall
+ # Web service
+ # Run these because the SysV package being removed won't do them
+ /sbin/chkconfig --del vboxweb-service >/dev/null 2>&1 || :
+fi
+
/bin/systemctl daemon-reload >/dev/null 2>&1 || :
/usr/bin/update-desktop-database &>/dev/null || :
@@ -472,12 +498,14 @@
%posttrans
/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
-
-# Guest additions install the OGL libraries
+# Guest additions install
%post guest
/sbin/ldconfig
/bin/systemctl daemon-reload >/dev/null 2>&1 || :
+# should be in kmod package, not here
+/bin/systemctl try-restart fedora-loadmodules.service >/dev/null 2>&1 || :
/bin/systemctl enable vboxservice.service >/dev/null 2>&1 || :
+/bin/systemctl restart vboxservice.service >/dev/null 2>&1 || :
%preun guest
if [ $1 -eq 0 ] ; then
@@ -489,11 +517,6 @@
%postun guest
/sbin/ldconfig
/bin/systemctl daemon-reload >/dev/null 2>&1 || :
-if [ $1 -ge 1 ] ; then
- # Package upgrade, not uninstall
- /bin/systemctl try-restart vboxservice.service >/dev/null 2>&1 || :
-fi
-
%files
%{_bindir}/VBox
@@ -510,14 +533,11 @@
%{_bindir}/VBoxTunctl
%{_bindir}/virtualbox
%{_bindir}/VirtualBox
-%if 0%{?fedora} < 18
+%if %{enable_webservice}
%{_bindir}/vboxwebsrv
%endif
%{_bindir}/VBoxVRDP
-%if 0%{?fedora} < 18
%dir %{_libdir}/virtualbox
-%doc %{_libdir}/virtualbox/*.pdf
-%endif
%{_libdir}/virtualbox/*.[^p]*
%{_libdir}/virtualbox/*.py*
%{_libdir}/virtualbox/components
@@ -528,7 +548,7 @@
%{_libdir}/virtualbox/VBoxTestOGL
%{_libdir}/virtualbox/VBoxXPCOMIPCD
%{_libdir}/virtualbox/VBoxBalloonCtrl
-%if 0%{?fedora} < 18
+%if %{enable_webservice}
%{_libdir}/virtualbox/vboxwebsrv
%{_libdir}/virtualbox/webtest
%endif
@@ -546,7 +566,11 @@
%config %{_sysconfdir}/vbox/vbox.cfg
%config %{_sysconfdir}/udev/rules.d/90-vboxdrv.rules
%config %{_sysconfdir}/sysconfig/modules/%{name}.modules
-%doc COPYING
+%doc COPYING*
+%doc doc/*.*
+%if %{enable_docs}
+%doc obj/bin/UserManual*.pdf
+%endif
%{_unitdir}/vboxweb.service
/lib/udev/VBoxCreateUSBNode.sh
@@ -584,6 +608,20 @@
%changelog
+* Mon Dec 24 2012 Sérgio Basto <sergio(a)serjux.com> - 4.2.4-1
+- New upstream release.
+- Fix some changelog dates.
+
+* Sun Dec 02 2012 Sérgio Basto <sergio(a)serjux.com> - 4.2.4-3
+- Use global variables enable_webservice and enable_docs to deal better with enable and disable that.
+- Include fr UserManual.pdf and put this docs in /usr/share/docs (the right place) .
+- Unbundle sources that aren't used.
+
+* Mon Oct 29 2012 Sérgio Basto <sergio(a)serjux.com> - 4.2.4-2
+- Try load new vbox modules right after install or upgrade.
+- Try better reload of vboxservice.service when as guest system.
+- Minor improves on systemd upgrade.
+
* Sat Oct 27 2012 Sérgio Basto <sergio(a)serjux.com> - 4.2.4-1
- New upstream release.
- Drop patch VirtualBox-4.2.0-xorg17.patch and add VBOX_USE_SYSTEM_XORG_HEADERS=1. Changeset r43588,
@@ -733,7 +771,7 @@
apply these fixes to VBox 4.1.10 as well." and add -lssl and -lcrypto by my self.
- drop Patch to allow to build with GCC 4.7
-* Tue Jan 15 2012 Sérgio Basto <sergio(a)serjux.com> - 4.1.8-4
+* Sun Jan 15 2012 Sérgio Basto <sergio(a)serjux.com> - 4.1.8-4
- Patch to allow to build with GCC 4.7
- Try fix usb/udev problem on updates without reboot computer.
- Improves on xorg17 patch, which is the xorg on guest part, we try build with our sources!.
@@ -892,18 +930,18 @@
- Exchange hardening for filesystem capabilities
- Enable web services
-* Sun Aug 08 2009 Lubomir Rintel <lkundrak(a)v3.sk> - 3.0.4-3
+* Sat Aug 08 2009 Lubomir Rintel <lkundrak(a)v3.sk> - 3.0.4-3
- Include VBoxRandR
- Add dri module to guest
- Resize attempts in GDM make SELinux unhappy
- Fix HAL policy file location
-* Sun Aug 08 2009 Lubomir Rintel <lkundrak(a)v3.sk> - 3.0.4-2
+* Sat Aug 08 2009 Lubomir Rintel <lkundrak(a)v3.sk> - 3.0.4-2
- Don't quote INSTALL_DIR in vbox.cfg so that we don't confuse vboxgtk
- Add python- subpackage
- Correct permissions on SDK directories (#754)
-* Sun Aug 08 2009 Lubomir Rintel <lkundrak(a)v3.sk> - 3.0.4-1
+* Sat Aug 08 2009 Lubomir Rintel <lkundrak(a)v3.sk> - 3.0.4-1
- Update to later upstream release
- Re-enable DRI again, fix drm_release crash
@@ -1059,7 +1097,7 @@
- Update to new version
- Adapt to new kBuild version, which seems to be needed
-* Wed Apr 21 2007 Till Maas <opensource till name> - 1.3.8-2
+* Sat Apr 21 2007 Till Maas <opensource till name> - 1.3.8-2
- minor bugfixes in the wrapper script
- rename to VirtualBox-OSE
Index: sources
===================================================================
RCS file: /cvs/free/rpms/VirtualBox/F-18/sources,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- sources 28 Oct 2012 16:54:57 -0000 1.41
+++ sources 25 Dec 2012 01:38:33 -0000 1.42
@@ -1 +1 @@
-d1ec2d2a3f2f3f0b277dfe2c520c2e33 VirtualBox-4.2.4.tar.bz2
+d680aeb3b4379b8281527aeb012b2df5 VirtualBox-4.2.6.tar.bz2
11 years, 4 months
rpms/mythweb/F-16 mythweb-0.26-fixes.patch, NONE, 1.1 ChangeLog, 1.1, 1.2 mythweb.spec, 1.3, 1.4 mythweb-php54.patch, 1.1, NONE
by Richard Shaw
Author: hobbes1069
Update of /cvs/free/rpms/mythweb/F-16
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv9412
Modified Files:
ChangeLog mythweb.spec
Added Files:
mythweb-0.26-fixes.patch
Removed Files:
mythweb-php54.patch
Log Message:
* Sat Dec 08 2012 Richard Shaw <hobbes1069(a)gmail.com> - 0.26.0-2
- Update to latest upstream release.
mythweb-0.26-fixes.patch:
classes/Video.php | 14 ++++---
modules/stream/stream_raw.pl | 4 ++
modules/video/handler.php | 26 +++++++++----
modules/video/stream.php | 69 +++++++++++++++++++++++++++++++++++
modules/video/tmpl/default/video.php | 2 -
mythweb.php | 2 -
6 files changed, 101 insertions(+), 16 deletions(-)
--- NEW FILE mythweb-0.26-fixes.patch ---
classes/Video.php | 14 ++++----
modules/stream/stream_raw.pl | 4 +++
modules/video/handler.php | 26 +++++++++-----
modules/video/stream.php | 69 ++++++++++++++++++++++++++++++++++++
modules/video/tmpl/default/video.php | 2 +-
mythweb.php | 2 +-
6 files changed, 101 insertions(+), 16 deletions(-)
diff --git a/classes/Video.php b/classes/Video.php
index 7995aa4..5c6f7e4 100644
--- a/classes/Video.php
+++ b/classes/Video.php
@@ -90,12 +90,14 @@ class Video {
$this->childid = $video['childid'];
// Figure out the URL
$this->url = '#';
- if (file_exists('data/video/'))
- $this->url = implode('/', array_map('rawurlencode',
- array_map('utf8tolocal',
- explode('/',
- 'data/video/' . preg_replace('#^'.$mythvideo_dir.'/?#', '', $this->filename)
- ))));
+ //// all junk, replacing
+// if (file_exists('data/video/'))
+// $this->url = implode('/', array_map('rawurlencode',
+// array_map('utf8tolocal',
+// explode('/',
+// 'data/video/' . preg_replace('#^'.$mythvideo_dir.'/?#', '', $this->filename)
+// ))));
+ $this->url = 'video/stream?Id=' . $this->intid;
$genre = $db->query('SELECT idgenre
FROM videometadatagenre
WHERE idvideo = ?',
diff --git a/modules/stream/stream_raw.pl b/modules/stream/stream_raw.pl
index 31f6854..6981bca 100755
--- a/modules/stream/stream_raw.pl
+++ b/modules/stream/stream_raw.pl
@@ -30,6 +30,10 @@
$type = 'video/nuppelvideo';
$suffix = '.nuv';
}
+ elsif ($basename =~ /\.mkv$/) {
+ $type = 'video/x-matroska';
+ $suffix = '.mkv';
+ }
else {
print header(),
"Unknown video type requested: $basename\n";
diff --git a/modules/video/handler.php b/modules/video/handler.php
index fd769ce..721f186 100644
--- a/modules/video/handler.php
+++ b/modules/video/handler.php
@@ -15,8 +15,10 @@
* @global string $GLOBALS['mythvideo_dir']
* @name $mythvideo_dir
/**/
- global $mythvideo_dir;
- $mythvideo_dir = setting('VideoStartupDir', hostname);
+
+//// dont need this...
+// global $mythvideo_dir;
+// $mythvideo_dir = setting('VideoStartupDir', hostname);
// Load the video storage directories
$video_dirs = $db->query_list('
@@ -37,6 +39,7 @@
}
}
+/** nor any of this...
// Make sure the video directory exists
if (file_exists('data/video')) {
// File is not a directory or a symlink
@@ -93,7 +96,7 @@
.' reload this page.');
}
// Create a symlink to the first artwork directory that we find.
- /** @todo we should really support multiple directories, but it's too much effort to hack in at the moment. */
+ // @todo we should really support multiple directories, but it's too much effort to hack in at the moment.
else {
foreach ($artwork_dirs as $dir) {
if (is_dir($dir) || is_link($dir)) {
@@ -116,6 +119,7 @@
}
}
}
+*/
define('video_img_height', _or(setting('web_video_thumbnail_height', hostname), 140));
define('video_img_width', _or(setting('web_video_thumbnail_width', hostname), 94));
@@ -125,11 +129,17 @@
case 'edit':
require_once 'modules/video/edit.php';
exit;
- case 'imdb':
- require_once 'modules/video/imdb.php';
- exit;
- case 'scan':
- require_once 'modules/video/scan.php';
+//// this is probably doing bad things
+// case 'imdb':
+// require_once 'modules/video/imdb.php';
+// exit;
+//// this is broken, so disable it
+// case 'scan':
+// require_once 'modules/video/scan.php';
+// exit;
+//// new stuff
+ case 'stream':
+ require_once 'modules/video/stream.php';
exit;
}
diff --git a/modules/video/stream.php b/modules/video/stream.php
new file mode 100644
index 0000000..49a7298
--- /dev/null
+++ b/modules/video/stream.php
@@ -0,0 +1,69 @@
+<?php
+/**
+ * Stream a music file
+ *
+ * @license GPL
+ *
+ * @package MythWeb
+ * @subpackage Music
+/**/
+
+// Yes, a db connection
+ global $db;
+
+// Pull video ID
+ $vid_id = $_GET['Id'];
+
+// Get filename
+ list($fname) = $db->query_row('SELECT filename
+ FROM videometadata
+ WHERE intid = ?', $vid_id);
+
+// Mime type
+ switch (substr($fname, strrpos($fname, '.'))) {
+ case 'mpg':
+ case 'mpeg':
+ $mime = 'video/mpeg';
+ break;
+ case 'mp4':
+ $mime = 'video/mp4';
+ break;
+ case 'ogg':
+ case 'ogm':
+ case 'ogv':
+ $mime = 'video/ogg';
+ break;
+ case 'qt':
+ $mime = 'video/quicktime';
+ break;
+ case 'webm':
+ $mime = 'video/webm';
+ break;
+ case 'mkv':
+ $mime = 'video/x-matroska';
+ break;
+ case 'wmv':
+ $mime = 'video/x-ms-wmv';
+ break;
+ case 'flv':
+ $mime = 'video/x-flv';
+ break;
+ default:
+ $mime = 'applicatoin/octet-stream';
+ }
+ header('Content-Type: '.$mime);
+
+// Send the filename
+ header('Content-Disposition: filename="'.$fname.'"');
+
+// Send data via the backend
+ $Master_Host = setting('MasterServerIP');
+ $port = _or(get_backend_setting('BackendStatusPort', $Master_Host),
+ get_backend_setting('BackendStatusPort'));
+ if (stripos($Master_Host,':') !== false) {
+ $Master_Host = '['.$Master_Host.']';
+ }
+ readfile("http://$Master_Host:$port/Content/GetVideo?Id=".$vid_id);
+
+// Nothing else to do
+ exit;
diff --git a/modules/video/tmpl/default/video.php b/modules/video/tmpl/default/video.php
index e80176e..ad7e9a9 100644
--- a/modules/video/tmpl/default/video.php
+++ b/modules/video/tmpl/default/video.php
@@ -252,7 +252,7 @@
<table width="100%" border="0" cellpadding="4" cellspacing="2" class="list small">
<tr class="menu">
<td>
- <span style="float: right"><input type="button" value="<?php echo t('Scan Collection'); ?>" class="submit" onclick="scan()"></span>
+<!-- Bad! Don't do this! <span style="float: right"><input type="button" value="<?php echo t('Scan Collection'); ?>" class="submit" onclick="scan()"></span> -->
<form action="<?php echo root_url; ?>video" method="GET">
<?php echo t('Display'); ?>:
<select name="category" id="category" onchange="filter();">
diff --git a/mythweb.php b/mythweb.php
index bba2aa8..79ff196 100644
--- a/mythweb.php
+++ b/mythweb.php
@@ -30,7 +30,7 @@
if (Modules::getModule($Path[0])) {
// Add the current module directory to our search path, so modules can
// define includes, etc.
- ini_set('include_path', ini_get('include_path').':'.modules_path.'/'.$Path[0]);
+ ini_set('include_path', ini_get('include_path').PATH_SEPARATOR.modules_path.'/'.$Path[0]);
// Load the module handler
require_once 'handler.php';
}
Index: ChangeLog
===================================================================
RCS file: /cvs/free/rpms/mythweb/F-16/ChangeLog,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ChangeLog 6 Jul 2012 18:02:11 -0000 1.1
+++ ChangeLog 24 Dec 2012 19:25:32 -0000 1.2
@@ -1,52 +1,21 @@
-commit 89a347c85284c5cf3ca3ad7250f21c7e698af858
-Author: Michael T. Dean <mdean(a)mythtv.org>
-Date: Wed May 30 17:19:55 2012 -0400
+commit f82ca9521775edbbc53caf0f40f7bc183732dcc2
+Author: Karl Dietz <dekarl(a)users.sourceforge.net>
+Date: Fri Aug 3 23:26:30 2012 +0200
- Fix MythWeb Upcoming Recordings programinfo usage.
+ Use PATH_SEPARATOR rather than ':' in mythweb.php.
- The programinfo refactor in #8406 changed the order of fields returned
- in a programinfo string list, and a reference was missed in the MythWeb
- Schedule class. The result is that any recording rule with recordid of
- 6 was skipped/didn't show in Upcoming Recordings.
+ Fixes #10791
- The original intent of the code was to skip recordings with recstatus of
- rsNotListed (as shown in commits e728aea5 and 508103511 , committed for
- which has since been modified, again, by a41e9657. (Therefore, the
- index in this commit is correct for 0.25-fixes and above, but should be
- 18 for 0.24-fixes.)
-
- Thanks to JK on the -users list for finding the issue.
- (cherry picked from commit 39a5dcd101ce7a6b97474f7b824b358f6e05c0cd)
+ Signed-off-by: Raymond Wagner <rwagner(a)mythtv.org>
+ (cherry picked from commit f9f5a1f43f2ddfeaa038054226f6ac0aa0b973e6)
-commit 8c43d8da31d738c75ec6abc9daff2772b16310c8
-Author: David Engel <david(a)istwok.net>
-Date: Mon Apr 30 17:01:44 2012 -0500
+commit 4fd9d5e05065c31e574e69251f872b1f53b7b027
+Author: R.D. Vaughan <r.d.vaughan(a)rogers.com>
+Date: Tue Oct 16 06:00:31 2012 -0400
- Clear the search type when creating an override or don't record for
- non-manual rules. Based on a patch from david.osguthorpe.
+ Add recognition of mkv containers to MythWeb for raw streaming.
- Fixes #10580 and fixes #10650 .
-
-commit 1833030d2ce0b5f2ec4f507031e6628458ca46b9
-Author: Kenni Lund <kenni(a)mythtv.org>
-Date: Wed Apr 11 21:06:29 2012 +0200
-
- Convert the Spanish (es_es) translation files to UTF8.
+ Fixes #11180
- Refs. #10575.
-
-commit 4d6e6219083446c024e8467cbff64ab42521b05c
-Author: Antonio Marcos López Alonso <amlopezalonso(a)gmail.com>
-Date: Wed Apr 11 20:55:18 2012 +0200
-
- Update the Spanish translation.
-
- Refs. #10575.
-
- Signed-off-by: Kenni Lund <kenni(a)mythtv.org>
-
-commit ed863708c02dd3620a7f4c0e37b118d00e712daa
-Author: Gavin Hurlbut <ghurlbut(a)mythtv.org>
-Date: Tue Apr 10 00:18:10 2012 -0700
-
- Force a commit
+ Signed-off-by: Raymond Wagner <rwagner(a)mythtv.org>
+ (cherry picked from commit ce2368132f823284588b02f8a1f66e0576d8c107)
Index: mythweb.spec
===================================================================
RCS file: /cvs/free/rpms/mythweb/F-16/mythweb.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mythweb.spec 29 Oct 2012 20:46:44 -0000 1.3
+++ mythweb.spec 24 Dec 2012 19:25:32 -0000 1.4
@@ -1,15 +1,15 @@
# Mythweb from github.com
# git hash for archive
-%global githash1 g89a347c
-%global githash2 a8ad01c
+%global githash1 g4dcd253
+%global githash2 4e9fd7a
Name: mythweb
Summary: The web interface to MythTV
URL: http://www.mythtv.org/
Group: Applications/Multimedia
-Version: 0.25.3
-Release: 1%{?dist}
+Version: 0.26.0
+Release: 2%{?dist}
License: GPLv2 and LGPLv2 and MIT
@@ -18,13 +18,12 @@
Source1: mythweb.conf
Source2: ChangeLog
+Patch0: mythweb-0.26-fixes.patch
+
# Patch generated from mythweb fixes branch. From mythweb git directory:
# git diff -p --stat %{version} > mythweb-fixes.patch
#Patch0: mythweb-fixes.patch
-# Needed for PHP 5.4
-Patch1: mythweb-php54.patch
-
# The following are required only in mythweb is running on the same computer
# as the backend. They will be pulled in by the mythtv meta package anyway.
#Requires: mythtv-backend >= %{version}-%{release}
@@ -35,6 +34,7 @@
Requires: php-mysql
Requires: php-process
Requires: php-MythTV >= %{version}
+Requires: mythffmpeg
BuildArch: noarch
@@ -45,7 +45,7 @@
%prep
%setup -q -n MythTV-mythweb-%{githash2}
-%patch1 -p1 -b .php54
+%patch0 -p1
# Fix directory permissions
#find ./ -type d -exec chmod 0755 {} \;
@@ -66,8 +66,9 @@
cp -a * %{buildroot}%{_datadir}/mythweb/
mkdir -p %{buildroot}%{_sysconfdir}/httpd/conf.d
cp %{SOURCE1} %{buildroot}%{_sysconfdir}/httpd/conf.d/
-# drop .htaccess file, settings handled in the above
-rm -f %{buildroot}%{_datadir}/mythweb/data/.htaccess
+
+# Remove stuff covered by %%doc
+rm %{buildroot}%{_datadir}/mythweb/{LICENSE,README,INSTALL,ChangeLog}
%files
@@ -78,7 +79,10 @@
%changelog
-* Mon Oct 29 2012 Richard Shaw <hobbes1069(a)gmail.com> - 0.25.3-1
+* Sat Dec 08 2012 Richard Shaw <hobbes1069(a)gmail.com> - 0.26.0-2
+- Update to latest upstream release.
+
+* Sun Oct 28 2012 Richard Shaw <hobbes1069(a)gmail.com> - 0.26.0-1
- Update to latest upstream release.
* Mon Jul 30 2012 Richard Shaw <hobbes1069(a)gmail.com> - 0.25.2-1
--- mythweb-php54.patch DELETED ---
11 years, 4 months
rpms/mythweb/F-17 mythweb-0.26-fixes.patch, NONE, 1.1 ChangeLog, 1.2, 1.3 mythweb.spec, 1.4, 1.5
by Richard Shaw
Author: hobbes1069
Update of /cvs/free/rpms/mythweb/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv9244
Modified Files:
ChangeLog mythweb.spec
Added Files:
mythweb-0.26-fixes.patch
Log Message:
* Sat Dec 08 2012 Richard Shaw <hobbes1069(a)gmail.com> - 0.26.0-2
- Update to latest upstream release.
mythweb-0.26-fixes.patch:
classes/Video.php | 14 ++++---
modules/stream/stream_raw.pl | 4 ++
modules/video/handler.php | 26 +++++++++----
modules/video/stream.php | 69 +++++++++++++++++++++++++++++++++++
modules/video/tmpl/default/video.php | 2 -
mythweb.php | 2 -
6 files changed, 101 insertions(+), 16 deletions(-)
--- NEW FILE mythweb-0.26-fixes.patch ---
classes/Video.php | 14 ++++----
modules/stream/stream_raw.pl | 4 +++
modules/video/handler.php | 26 +++++++++-----
modules/video/stream.php | 69 ++++++++++++++++++++++++++++++++++++
modules/video/tmpl/default/video.php | 2 +-
mythweb.php | 2 +-
6 files changed, 101 insertions(+), 16 deletions(-)
diff --git a/classes/Video.php b/classes/Video.php
index 7995aa4..5c6f7e4 100644
--- a/classes/Video.php
+++ b/classes/Video.php
@@ -90,12 +90,14 @@ class Video {
$this->childid = $video['childid'];
// Figure out the URL
$this->url = '#';
- if (file_exists('data/video/'))
- $this->url = implode('/', array_map('rawurlencode',
- array_map('utf8tolocal',
- explode('/',
- 'data/video/' . preg_replace('#^'.$mythvideo_dir.'/?#', '', $this->filename)
- ))));
+ //// all junk, replacing
+// if (file_exists('data/video/'))
+// $this->url = implode('/', array_map('rawurlencode',
+// array_map('utf8tolocal',
+// explode('/',
+// 'data/video/' . preg_replace('#^'.$mythvideo_dir.'/?#', '', $this->filename)
+// ))));
+ $this->url = 'video/stream?Id=' . $this->intid;
$genre = $db->query('SELECT idgenre
FROM videometadatagenre
WHERE idvideo = ?',
diff --git a/modules/stream/stream_raw.pl b/modules/stream/stream_raw.pl
index 31f6854..6981bca 100755
--- a/modules/stream/stream_raw.pl
+++ b/modules/stream/stream_raw.pl
@@ -30,6 +30,10 @@
$type = 'video/nuppelvideo';
$suffix = '.nuv';
}
+ elsif ($basename =~ /\.mkv$/) {
+ $type = 'video/x-matroska';
+ $suffix = '.mkv';
+ }
else {
print header(),
"Unknown video type requested: $basename\n";
diff --git a/modules/video/handler.php b/modules/video/handler.php
index fd769ce..721f186 100644
--- a/modules/video/handler.php
+++ b/modules/video/handler.php
@@ -15,8 +15,10 @@
* @global string $GLOBALS['mythvideo_dir']
* @name $mythvideo_dir
/**/
- global $mythvideo_dir;
- $mythvideo_dir = setting('VideoStartupDir', hostname);
+
+//// dont need this...
+// global $mythvideo_dir;
+// $mythvideo_dir = setting('VideoStartupDir', hostname);
// Load the video storage directories
$video_dirs = $db->query_list('
@@ -37,6 +39,7 @@
}
}
+/** nor any of this...
// Make sure the video directory exists
if (file_exists('data/video')) {
// File is not a directory or a symlink
@@ -93,7 +96,7 @@
.' reload this page.');
}
// Create a symlink to the first artwork directory that we find.
- /** @todo we should really support multiple directories, but it's too much effort to hack in at the moment. */
+ // @todo we should really support multiple directories, but it's too much effort to hack in at the moment.
else {
foreach ($artwork_dirs as $dir) {
if (is_dir($dir) || is_link($dir)) {
@@ -116,6 +119,7 @@
}
}
}
+*/
define('video_img_height', _or(setting('web_video_thumbnail_height', hostname), 140));
define('video_img_width', _or(setting('web_video_thumbnail_width', hostname), 94));
@@ -125,11 +129,17 @@
case 'edit':
require_once 'modules/video/edit.php';
exit;
- case 'imdb':
- require_once 'modules/video/imdb.php';
- exit;
- case 'scan':
- require_once 'modules/video/scan.php';
+//// this is probably doing bad things
+// case 'imdb':
+// require_once 'modules/video/imdb.php';
+// exit;
+//// this is broken, so disable it
+// case 'scan':
+// require_once 'modules/video/scan.php';
+// exit;
+//// new stuff
+ case 'stream':
+ require_once 'modules/video/stream.php';
exit;
}
diff --git a/modules/video/stream.php b/modules/video/stream.php
new file mode 100644
index 0000000..49a7298
--- /dev/null
+++ b/modules/video/stream.php
@@ -0,0 +1,69 @@
+<?php
+/**
+ * Stream a music file
+ *
+ * @license GPL
+ *
+ * @package MythWeb
+ * @subpackage Music
+/**/
+
+// Yes, a db connection
+ global $db;
+
+// Pull video ID
+ $vid_id = $_GET['Id'];
+
+// Get filename
+ list($fname) = $db->query_row('SELECT filename
+ FROM videometadata
+ WHERE intid = ?', $vid_id);
+
+// Mime type
+ switch (substr($fname, strrpos($fname, '.'))) {
+ case 'mpg':
+ case 'mpeg':
+ $mime = 'video/mpeg';
+ break;
+ case 'mp4':
+ $mime = 'video/mp4';
+ break;
+ case 'ogg':
+ case 'ogm':
+ case 'ogv':
+ $mime = 'video/ogg';
+ break;
+ case 'qt':
+ $mime = 'video/quicktime';
+ break;
+ case 'webm':
+ $mime = 'video/webm';
+ break;
+ case 'mkv':
+ $mime = 'video/x-matroska';
+ break;
+ case 'wmv':
+ $mime = 'video/x-ms-wmv';
+ break;
+ case 'flv':
+ $mime = 'video/x-flv';
+ break;
+ default:
+ $mime = 'applicatoin/octet-stream';
+ }
+ header('Content-Type: '.$mime);
+
+// Send the filename
+ header('Content-Disposition: filename="'.$fname.'"');
+
+// Send data via the backend
+ $Master_Host = setting('MasterServerIP');
+ $port = _or(get_backend_setting('BackendStatusPort', $Master_Host),
+ get_backend_setting('BackendStatusPort'));
+ if (stripos($Master_Host,':') !== false) {
+ $Master_Host = '['.$Master_Host.']';
+ }
+ readfile("http://$Master_Host:$port/Content/GetVideo?Id=".$vid_id);
+
+// Nothing else to do
+ exit;
diff --git a/modules/video/tmpl/default/video.php b/modules/video/tmpl/default/video.php
index e80176e..ad7e9a9 100644
--- a/modules/video/tmpl/default/video.php
+++ b/modules/video/tmpl/default/video.php
@@ -252,7 +252,7 @@
<table width="100%" border="0" cellpadding="4" cellspacing="2" class="list small">
<tr class="menu">
<td>
- <span style="float: right"><input type="button" value="<?php echo t('Scan Collection'); ?>" class="submit" onclick="scan()"></span>
+<!-- Bad! Don't do this! <span style="float: right"><input type="button" value="<?php echo t('Scan Collection'); ?>" class="submit" onclick="scan()"></span> -->
<form action="<?php echo root_url; ?>video" method="GET">
<?php echo t('Display'); ?>:
<select name="category" id="category" onchange="filter();">
diff --git a/mythweb.php b/mythweb.php
index bba2aa8..79ff196 100644
--- a/mythweb.php
+++ b/mythweb.php
@@ -30,7 +30,7 @@
if (Modules::getModule($Path[0])) {
// Add the current module directory to our search path, so modules can
// define includes, etc.
- ini_set('include_path', ini_get('include_path').':'.modules_path.'/'.$Path[0]);
+ ini_set('include_path', ini_get('include_path').PATH_SEPARATOR.modules_path.'/'.$Path[0]);
// Load the module handler
require_once 'handler.php';
}
Index: ChangeLog
===================================================================
RCS file: /cvs/free/rpms/mythweb/F-17/ChangeLog,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ChangeLog 30 Jul 2012 21:14:58 -0000 1.2
+++ ChangeLog 24 Dec 2012 19:24:21 -0000 1.3
@@ -0,0 +1,21 @@
+commit f82ca9521775edbbc53caf0f40f7bc183732dcc2
+Author: Karl Dietz <dekarl(a)users.sourceforge.net>
+Date: Fri Aug 3 23:26:30 2012 +0200
+
+ Use PATH_SEPARATOR rather than ':' in mythweb.php.
+
+ Fixes #10791
+
+ Signed-off-by: Raymond Wagner <rwagner(a)mythtv.org>
+ (cherry picked from commit f9f5a1f43f2ddfeaa038054226f6ac0aa0b973e6)
+
+commit 4fd9d5e05065c31e574e69251f872b1f53b7b027
+Author: R.D. Vaughan <r.d.vaughan(a)rogers.com>
+Date: Tue Oct 16 06:00:31 2012 -0400
+
+ Add recognition of mkv containers to MythWeb for raw streaming.
+
+ Fixes #11180
+
+ Signed-off-by: Raymond Wagner <rwagner(a)mythtv.org>
+ (cherry picked from commit ce2368132f823284588b02f8a1f66e0576d8c107)
Index: mythweb.spec
===================================================================
RCS file: /cvs/free/rpms/mythweb/F-17/mythweb.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- mythweb.spec 29 Oct 2012 20:42:21 -0000 1.4
+++ mythweb.spec 24 Dec 2012 19:24:22 -0000 1.5
@@ -9,7 +9,7 @@
Group: Applications/Multimedia
Version: 0.26.0
-Release: 1%{?dist}
+Release: 2%{?dist}
License: GPLv2 and LGPLv2 and MIT
@@ -18,6 +18,8 @@
Source1: mythweb.conf
Source2: ChangeLog
+Patch0: mythweb-0.26-fixes.patch
+
# Patch generated from mythweb fixes branch. From mythweb git directory:
# git diff -p --stat %{version} > mythweb-fixes.patch
#Patch0: mythweb-fixes.patch
@@ -43,7 +45,7 @@
%prep
%setup -q -n MythTV-mythweb-%{githash2}
-#patch1 -p1 -b .php54
+%patch0 -p1
# Fix directory permissions
#find ./ -type d -exec chmod 0755 {} \;
@@ -64,8 +66,9 @@
cp -a * %{buildroot}%{_datadir}/mythweb/
mkdir -p %{buildroot}%{_sysconfdir}/httpd/conf.d
cp %{SOURCE1} %{buildroot}%{_sysconfdir}/httpd/conf.d/
-# drop .htaccess file, settings handled in the above
-rm -f %{buildroot}%{_datadir}/mythweb/data/.htaccess
+
+# Remove stuff covered by %%doc
+rm %{buildroot}%{_datadir}/mythweb/{LICENSE,README,INSTALL,ChangeLog}
%files
@@ -76,8 +79,11 @@
%changelog
+* Sat Dec 08 2012 Richard Shaw <hobbes1069(a)gmail.com> - 0.26.0-2
+- Update to latest upstream release.
+
* Sun Oct 28 2012 Richard Shaw <hobbes1069(a)gmail.com> - 0.26.0-1
-* Update to latest upstream release.
+- Update to latest upstream release.
* Mon Jul 30 2012 Richard Shaw <hobbes1069(a)gmail.com> - 0.25.2-1
- Update to latests release.
11 years, 4 months
rpms/mythweb/devel mythweb-0.26-fixes.patch,NONE,1.1
by Richard Shaw
Author: hobbes1069
Update of /cvs/free/rpms/mythweb/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv9178
Added Files:
mythweb-0.26-fixes.patch
Log Message:
Add patch.
mythweb-0.26-fixes.patch:
classes/Video.php | 14 ++++---
modules/stream/stream_raw.pl | 4 ++
modules/video/handler.php | 26 +++++++++----
modules/video/stream.php | 69 +++++++++++++++++++++++++++++++++++
modules/video/tmpl/default/video.php | 2 -
mythweb.php | 2 -
6 files changed, 101 insertions(+), 16 deletions(-)
--- NEW FILE mythweb-0.26-fixes.patch ---
classes/Video.php | 14 ++++----
modules/stream/stream_raw.pl | 4 +++
modules/video/handler.php | 26 +++++++++-----
modules/video/stream.php | 69 ++++++++++++++++++++++++++++++++++++
modules/video/tmpl/default/video.php | 2 +-
mythweb.php | 2 +-
6 files changed, 101 insertions(+), 16 deletions(-)
diff --git a/classes/Video.php b/classes/Video.php
index 7995aa4..5c6f7e4 100644
--- a/classes/Video.php
+++ b/classes/Video.php
@@ -90,12 +90,14 @@ class Video {
$this->childid = $video['childid'];
// Figure out the URL
$this->url = '#';
- if (file_exists('data/video/'))
- $this->url = implode('/', array_map('rawurlencode',
- array_map('utf8tolocal',
- explode('/',
- 'data/video/' . preg_replace('#^'.$mythvideo_dir.'/?#', '', $this->filename)
- ))));
+ //// all junk, replacing
+// if (file_exists('data/video/'))
+// $this->url = implode('/', array_map('rawurlencode',
+// array_map('utf8tolocal',
+// explode('/',
+// 'data/video/' . preg_replace('#^'.$mythvideo_dir.'/?#', '', $this->filename)
+// ))));
+ $this->url = 'video/stream?Id=' . $this->intid;
$genre = $db->query('SELECT idgenre
FROM videometadatagenre
WHERE idvideo = ?',
diff --git a/modules/stream/stream_raw.pl b/modules/stream/stream_raw.pl
index 31f6854..6981bca 100755
--- a/modules/stream/stream_raw.pl
+++ b/modules/stream/stream_raw.pl
@@ -30,6 +30,10 @@
$type = 'video/nuppelvideo';
$suffix = '.nuv';
}
+ elsif ($basename =~ /\.mkv$/) {
+ $type = 'video/x-matroska';
+ $suffix = '.mkv';
+ }
else {
print header(),
"Unknown video type requested: $basename\n";
diff --git a/modules/video/handler.php b/modules/video/handler.php
index fd769ce..721f186 100644
--- a/modules/video/handler.php
+++ b/modules/video/handler.php
@@ -15,8 +15,10 @@
* @global string $GLOBALS['mythvideo_dir']
* @name $mythvideo_dir
/**/
- global $mythvideo_dir;
- $mythvideo_dir = setting('VideoStartupDir', hostname);
+
+//// dont need this...
+// global $mythvideo_dir;
+// $mythvideo_dir = setting('VideoStartupDir', hostname);
// Load the video storage directories
$video_dirs = $db->query_list('
@@ -37,6 +39,7 @@
}
}
+/** nor any of this...
// Make sure the video directory exists
if (file_exists('data/video')) {
// File is not a directory or a symlink
@@ -93,7 +96,7 @@
.' reload this page.');
}
// Create a symlink to the first artwork directory that we find.
- /** @todo we should really support multiple directories, but it's too much effort to hack in at the moment. */
+ // @todo we should really support multiple directories, but it's too much effort to hack in at the moment.
else {
foreach ($artwork_dirs as $dir) {
if (is_dir($dir) || is_link($dir)) {
@@ -116,6 +119,7 @@
}
}
}
+*/
define('video_img_height', _or(setting('web_video_thumbnail_height', hostname), 140));
define('video_img_width', _or(setting('web_video_thumbnail_width', hostname), 94));
@@ -125,11 +129,17 @@
case 'edit':
require_once 'modules/video/edit.php';
exit;
- case 'imdb':
- require_once 'modules/video/imdb.php';
- exit;
- case 'scan':
- require_once 'modules/video/scan.php';
+//// this is probably doing bad things
+// case 'imdb':
+// require_once 'modules/video/imdb.php';
+// exit;
+//// this is broken, so disable it
+// case 'scan':
+// require_once 'modules/video/scan.php';
+// exit;
+//// new stuff
+ case 'stream':
+ require_once 'modules/video/stream.php';
exit;
}
diff --git a/modules/video/stream.php b/modules/video/stream.php
new file mode 100644
index 0000000..49a7298
--- /dev/null
+++ b/modules/video/stream.php
@@ -0,0 +1,69 @@
+<?php
+/**
+ * Stream a music file
+ *
+ * @license GPL
+ *
+ * @package MythWeb
+ * @subpackage Music
+/**/
+
+// Yes, a db connection
+ global $db;
+
+// Pull video ID
+ $vid_id = $_GET['Id'];
+
+// Get filename
+ list($fname) = $db->query_row('SELECT filename
+ FROM videometadata
+ WHERE intid = ?', $vid_id);
+
+// Mime type
+ switch (substr($fname, strrpos($fname, '.'))) {
+ case 'mpg':
+ case 'mpeg':
+ $mime = 'video/mpeg';
+ break;
+ case 'mp4':
+ $mime = 'video/mp4';
+ break;
+ case 'ogg':
+ case 'ogm':
+ case 'ogv':
+ $mime = 'video/ogg';
+ break;
+ case 'qt':
+ $mime = 'video/quicktime';
+ break;
+ case 'webm':
+ $mime = 'video/webm';
+ break;
+ case 'mkv':
+ $mime = 'video/x-matroska';
+ break;
+ case 'wmv':
+ $mime = 'video/x-ms-wmv';
+ break;
+ case 'flv':
+ $mime = 'video/x-flv';
+ break;
+ default:
+ $mime = 'applicatoin/octet-stream';
+ }
+ header('Content-Type: '.$mime);
+
+// Send the filename
+ header('Content-Disposition: filename="'.$fname.'"');
+
+// Send data via the backend
+ $Master_Host = setting('MasterServerIP');
+ $port = _or(get_backend_setting('BackendStatusPort', $Master_Host),
+ get_backend_setting('BackendStatusPort'));
+ if (stripos($Master_Host,':') !== false) {
+ $Master_Host = '['.$Master_Host.']';
+ }
+ readfile("http://$Master_Host:$port/Content/GetVideo?Id=".$vid_id);
+
+// Nothing else to do
+ exit;
diff --git a/modules/video/tmpl/default/video.php b/modules/video/tmpl/default/video.php
index e80176e..ad7e9a9 100644
--- a/modules/video/tmpl/default/video.php
+++ b/modules/video/tmpl/default/video.php
@@ -252,7 +252,7 @@
<table width="100%" border="0" cellpadding="4" cellspacing="2" class="list small">
<tr class="menu">
<td>
- <span style="float: right"><input type="button" value="<?php echo t('Scan Collection'); ?>" class="submit" onclick="scan()"></span>
+<!-- Bad! Don't do this! <span style="float: right"><input type="button" value="<?php echo t('Scan Collection'); ?>" class="submit" onclick="scan()"></span> -->
<form action="<?php echo root_url; ?>video" method="GET">
<?php echo t('Display'); ?>:
<select name="category" id="category" onchange="filter();">
diff --git a/mythweb.php b/mythweb.php
index bba2aa8..79ff196 100644
--- a/mythweb.php
+++ b/mythweb.php
@@ -30,7 +30,7 @@
if (Modules::getModule($Path[0])) {
// Add the current module directory to our search path, so modules can
// define includes, etc.
- ini_set('include_path', ini_get('include_path').':'.modules_path.'/'.$Path[0]);
+ ini_set('include_path', ini_get('include_path').PATH_SEPARATOR.modules_path.'/'.$Path[0]);
// Load the module handler
require_once 'handler.php';
}
11 years, 4 months
rpms/mythweb/F-18 mythweb-0.26-fixes.patch, NONE, 1.1 ChangeLog, 1.2, 1.3 mythweb.spec, 1.4, 1.5
by Richard Shaw
Author: hobbes1069
Update of /cvs/free/rpms/mythweb/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv9048
Modified Files:
ChangeLog mythweb.spec
Added Files:
mythweb-0.26-fixes.patch
Log Message:
* Sat Dec 08 2012 Richard Shaw <hobbes1069(a)gmail.com> - 0.26.0-2
- Update to latest upstream release.
mythweb-0.26-fixes.patch:
classes/Video.php | 14 ++++---
modules/stream/stream_raw.pl | 4 ++
modules/video/handler.php | 26 +++++++++----
modules/video/stream.php | 69 +++++++++++++++++++++++++++++++++++
modules/video/tmpl/default/video.php | 2 -
mythweb.php | 2 -
6 files changed, 101 insertions(+), 16 deletions(-)
--- NEW FILE mythweb-0.26-fixes.patch ---
classes/Video.php | 14 ++++----
modules/stream/stream_raw.pl | 4 +++
modules/video/handler.php | 26 +++++++++-----
modules/video/stream.php | 69 ++++++++++++++++++++++++++++++++++++
modules/video/tmpl/default/video.php | 2 +-
mythweb.php | 2 +-
6 files changed, 101 insertions(+), 16 deletions(-)
diff --git a/classes/Video.php b/classes/Video.php
index 7995aa4..5c6f7e4 100644
--- a/classes/Video.php
+++ b/classes/Video.php
@@ -90,12 +90,14 @@ class Video {
$this->childid = $video['childid'];
// Figure out the URL
$this->url = '#';
- if (file_exists('data/video/'))
- $this->url = implode('/', array_map('rawurlencode',
- array_map('utf8tolocal',
- explode('/',
- 'data/video/' . preg_replace('#^'.$mythvideo_dir.'/?#', '', $this->filename)
- ))));
+ //// all junk, replacing
+// if (file_exists('data/video/'))
+// $this->url = implode('/', array_map('rawurlencode',
+// array_map('utf8tolocal',
+// explode('/',
+// 'data/video/' . preg_replace('#^'.$mythvideo_dir.'/?#', '', $this->filename)
+// ))));
+ $this->url = 'video/stream?Id=' . $this->intid;
$genre = $db->query('SELECT idgenre
FROM videometadatagenre
WHERE idvideo = ?',
diff --git a/modules/stream/stream_raw.pl b/modules/stream/stream_raw.pl
index 31f6854..6981bca 100755
--- a/modules/stream/stream_raw.pl
+++ b/modules/stream/stream_raw.pl
@@ -30,6 +30,10 @@
$type = 'video/nuppelvideo';
$suffix = '.nuv';
}
+ elsif ($basename =~ /\.mkv$/) {
+ $type = 'video/x-matroska';
+ $suffix = '.mkv';
+ }
else {
print header(),
"Unknown video type requested: $basename\n";
diff --git a/modules/video/handler.php b/modules/video/handler.php
index fd769ce..721f186 100644
--- a/modules/video/handler.php
+++ b/modules/video/handler.php
@@ -15,8 +15,10 @@
* @global string $GLOBALS['mythvideo_dir']
* @name $mythvideo_dir
/**/
- global $mythvideo_dir;
- $mythvideo_dir = setting('VideoStartupDir', hostname);
+
+//// dont need this...
+// global $mythvideo_dir;
+// $mythvideo_dir = setting('VideoStartupDir', hostname);
// Load the video storage directories
$video_dirs = $db->query_list('
@@ -37,6 +39,7 @@
}
}
+/** nor any of this...
// Make sure the video directory exists
if (file_exists('data/video')) {
// File is not a directory or a symlink
@@ -93,7 +96,7 @@
.' reload this page.');
}
// Create a symlink to the first artwork directory that we find.
- /** @todo we should really support multiple directories, but it's too much effort to hack in at the moment. */
+ // @todo we should really support multiple directories, but it's too much effort to hack in at the moment.
else {
foreach ($artwork_dirs as $dir) {
if (is_dir($dir) || is_link($dir)) {
@@ -116,6 +119,7 @@
}
}
}
+*/
define('video_img_height', _or(setting('web_video_thumbnail_height', hostname), 140));
define('video_img_width', _or(setting('web_video_thumbnail_width', hostname), 94));
@@ -125,11 +129,17 @@
case 'edit':
require_once 'modules/video/edit.php';
exit;
- case 'imdb':
- require_once 'modules/video/imdb.php';
- exit;
- case 'scan':
- require_once 'modules/video/scan.php';
+//// this is probably doing bad things
+// case 'imdb':
+// require_once 'modules/video/imdb.php';
+// exit;
+//// this is broken, so disable it
+// case 'scan':
+// require_once 'modules/video/scan.php';
+// exit;
+//// new stuff
+ case 'stream':
+ require_once 'modules/video/stream.php';
exit;
}
diff --git a/modules/video/stream.php b/modules/video/stream.php
new file mode 100644
index 0000000..49a7298
--- /dev/null
+++ b/modules/video/stream.php
@@ -0,0 +1,69 @@
+<?php
+/**
+ * Stream a music file
+ *
+ * @license GPL
+ *
+ * @package MythWeb
+ * @subpackage Music
+/**/
+
+// Yes, a db connection
+ global $db;
+
+// Pull video ID
+ $vid_id = $_GET['Id'];
+
+// Get filename
+ list($fname) = $db->query_row('SELECT filename
+ FROM videometadata
+ WHERE intid = ?', $vid_id);
+
+// Mime type
+ switch (substr($fname, strrpos($fname, '.'))) {
+ case 'mpg':
+ case 'mpeg':
+ $mime = 'video/mpeg';
+ break;
+ case 'mp4':
+ $mime = 'video/mp4';
+ break;
+ case 'ogg':
+ case 'ogm':
+ case 'ogv':
+ $mime = 'video/ogg';
+ break;
+ case 'qt':
+ $mime = 'video/quicktime';
+ break;
+ case 'webm':
+ $mime = 'video/webm';
+ break;
+ case 'mkv':
+ $mime = 'video/x-matroska';
+ break;
+ case 'wmv':
+ $mime = 'video/x-ms-wmv';
+ break;
+ case 'flv':
+ $mime = 'video/x-flv';
+ break;
+ default:
+ $mime = 'applicatoin/octet-stream';
+ }
+ header('Content-Type: '.$mime);
+
+// Send the filename
+ header('Content-Disposition: filename="'.$fname.'"');
+
+// Send data via the backend
+ $Master_Host = setting('MasterServerIP');
+ $port = _or(get_backend_setting('BackendStatusPort', $Master_Host),
+ get_backend_setting('BackendStatusPort'));
+ if (stripos($Master_Host,':') !== false) {
+ $Master_Host = '['.$Master_Host.']';
+ }
+ readfile("http://$Master_Host:$port/Content/GetVideo?Id=".$vid_id);
+
+// Nothing else to do
+ exit;
diff --git a/modules/video/tmpl/default/video.php b/modules/video/tmpl/default/video.php
index e80176e..ad7e9a9 100644
--- a/modules/video/tmpl/default/video.php
+++ b/modules/video/tmpl/default/video.php
@@ -252,7 +252,7 @@
<table width="100%" border="0" cellpadding="4" cellspacing="2" class="list small">
<tr class="menu">
<td>
- <span style="float: right"><input type="button" value="<?php echo t('Scan Collection'); ?>" class="submit" onclick="scan()"></span>
+<!-- Bad! Don't do this! <span style="float: right"><input type="button" value="<?php echo t('Scan Collection'); ?>" class="submit" onclick="scan()"></span> -->
<form action="<?php echo root_url; ?>video" method="GET">
<?php echo t('Display'); ?>:
<select name="category" id="category" onchange="filter();">
diff --git a/mythweb.php b/mythweb.php
index bba2aa8..79ff196 100644
--- a/mythweb.php
+++ b/mythweb.php
@@ -30,7 +30,7 @@
if (Modules::getModule($Path[0])) {
// Add the current module directory to our search path, so modules can
// define includes, etc.
- ini_set('include_path', ini_get('include_path').':'.modules_path.'/'.$Path[0]);
+ ini_set('include_path', ini_get('include_path').PATH_SEPARATOR.modules_path.'/'.$Path[0]);
// Load the module handler
require_once 'handler.php';
}
Index: ChangeLog
===================================================================
RCS file: /cvs/free/rpms/mythweb/F-18/ChangeLog,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ChangeLog 30 Jul 2012 21:14:03 -0000 1.2
+++ ChangeLog 24 Dec 2012 19:23:08 -0000 1.3
@@ -0,0 +1,21 @@
+commit f82ca9521775edbbc53caf0f40f7bc183732dcc2
+Author: Karl Dietz <dekarl(a)users.sourceforge.net>
+Date: Fri Aug 3 23:26:30 2012 +0200
+
+ Use PATH_SEPARATOR rather than ':' in mythweb.php.
+
+ Fixes #10791
+
+ Signed-off-by: Raymond Wagner <rwagner(a)mythtv.org>
+ (cherry picked from commit f9f5a1f43f2ddfeaa038054226f6ac0aa0b973e6)
+
+commit 4fd9d5e05065c31e574e69251f872b1f53b7b027
+Author: R.D. Vaughan <r.d.vaughan(a)rogers.com>
+Date: Tue Oct 16 06:00:31 2012 -0400
+
+ Add recognition of mkv containers to MythWeb for raw streaming.
+
+ Fixes #11180
+
+ Signed-off-by: Raymond Wagner <rwagner(a)mythtv.org>
+ (cherry picked from commit ce2368132f823284588b02f8a1f66e0576d8c107)
Index: mythweb.spec
===================================================================
RCS file: /cvs/free/rpms/mythweb/F-18/mythweb.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- mythweb.spec 29 Oct 2012 20:41:38 -0000 1.4
+++ mythweb.spec 24 Dec 2012 19:23:09 -0000 1.5
@@ -9,7 +9,7 @@
Group: Applications/Multimedia
Version: 0.26.0
-Release: 1%{?dist}
+Release: 2%{?dist}
License: GPLv2 and LGPLv2 and MIT
@@ -18,6 +18,8 @@
Source1: mythweb.conf
Source2: ChangeLog
+Patch0: mythweb-0.26-fixes.patch
+
# Patch generated from mythweb fixes branch. From mythweb git directory:
# git diff -p --stat %{version} > mythweb-fixes.patch
#Patch0: mythweb-fixes.patch
@@ -43,7 +45,7 @@
%prep
%setup -q -n MythTV-mythweb-%{githash2}
-#patch1 -p1 -b .php54
+%patch0 -p1
# Fix directory permissions
#find ./ -type d -exec chmod 0755 {} \;
@@ -64,8 +66,9 @@
cp -a * %{buildroot}%{_datadir}/mythweb/
mkdir -p %{buildroot}%{_sysconfdir}/httpd/conf.d
cp %{SOURCE1} %{buildroot}%{_sysconfdir}/httpd/conf.d/
-# drop .htaccess file, settings handled in the above
-rm -f %{buildroot}%{_datadir}/mythweb/data/.htaccess
+
+# Remove stuff covered by %%doc
+rm %{buildroot}%{_datadir}/mythweb/{LICENSE,README,INSTALL,ChangeLog}
%files
@@ -76,8 +79,11 @@
%changelog
+* Sat Dec 08 2012 Richard Shaw <hobbes1069(a)gmail.com> - 0.26.0-2
+- Update to latest upstream release.
+
* Sun Oct 28 2012 Richard Shaw <hobbes1069(a)gmail.com> - 0.26.0-1
-* Update to latest upstream release.
+- Update to latest upstream release.
* Mon Jul 30 2012 Richard Shaw <hobbes1069(a)gmail.com> - 0.25.2-1
- Update to latests release.
11 years, 4 months
rpms/mythweb/devel ChangeLog,1.2,1.3 mythweb.spec,1.4,1.5
by Richard Shaw
Author: hobbes1069
Update of /cvs/free/rpms/mythweb/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv8882
Modified Files:
ChangeLog mythweb.spec
Log Message:
* Sat Dec 08 2012 Richard Shaw <hobbes1069(a)gmail.com> - 0.26.0-2
- Update to latest upstream release.
Index: ChangeLog
===================================================================
RCS file: /cvs/free/rpms/mythweb/devel/ChangeLog,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ChangeLog 30 Jul 2012 21:14:03 -0000 1.2
+++ ChangeLog 24 Dec 2012 19:21:49 -0000 1.3
@@ -0,0 +1,21 @@
+commit f82ca9521775edbbc53caf0f40f7bc183732dcc2
+Author: Karl Dietz <dekarl(a)users.sourceforge.net>
+Date: Fri Aug 3 23:26:30 2012 +0200
+
+ Use PATH_SEPARATOR rather than ':' in mythweb.php.
+
+ Fixes #10791
+
+ Signed-off-by: Raymond Wagner <rwagner(a)mythtv.org>
+ (cherry picked from commit f9f5a1f43f2ddfeaa038054226f6ac0aa0b973e6)
+
+commit 4fd9d5e05065c31e574e69251f872b1f53b7b027
+Author: R.D. Vaughan <r.d.vaughan(a)rogers.com>
+Date: Tue Oct 16 06:00:31 2012 -0400
+
+ Add recognition of mkv containers to MythWeb for raw streaming.
+
+ Fixes #11180
+
+ Signed-off-by: Raymond Wagner <rwagner(a)mythtv.org>
+ (cherry picked from commit ce2368132f823284588b02f8a1f66e0576d8c107)
Index: mythweb.spec
===================================================================
RCS file: /cvs/free/rpms/mythweb/devel/mythweb.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- mythweb.spec 29 Oct 2012 20:40:49 -0000 1.4
+++ mythweb.spec 24 Dec 2012 19:21:49 -0000 1.5
@@ -9,7 +9,7 @@
Group: Applications/Multimedia
Version: 0.26.0
-Release: 1%{?dist}
+Release: 2%{?dist}
License: GPLv2 and LGPLv2 and MIT
@@ -18,6 +18,8 @@
Source1: mythweb.conf
Source2: ChangeLog
+Patch0: mythweb-0.26-fixes.patch
+
# Patch generated from mythweb fixes branch. From mythweb git directory:
# git diff -p --stat %{version} > mythweb-fixes.patch
#Patch0: mythweb-fixes.patch
@@ -43,7 +45,7 @@
%prep
%setup -q -n MythTV-mythweb-%{githash2}
-#patch1 -p1 -b .php54
+%patch0 -p1
# Fix directory permissions
#find ./ -type d -exec chmod 0755 {} \;
@@ -64,8 +66,9 @@
cp -a * %{buildroot}%{_datadir}/mythweb/
mkdir -p %{buildroot}%{_sysconfdir}/httpd/conf.d
cp %{SOURCE1} %{buildroot}%{_sysconfdir}/httpd/conf.d/
-# drop .htaccess file, settings handled in the above
-rm -f %{buildroot}%{_datadir}/mythweb/data/.htaccess
+
+# Remove stuff covered by %%doc
+rm %{buildroot}%{_datadir}/mythweb/{LICENSE,README,INSTALL,ChangeLog}
%files
@@ -76,8 +79,11 @@
%changelog
+* Sat Dec 08 2012 Richard Shaw <hobbes1069(a)gmail.com> - 0.26.0-2
+- Update to latest upstream release.
+
* Sun Oct 28 2012 Richard Shaw <hobbes1069(a)gmail.com> - 0.26.0-1
-* Update to latest upstream release.
+- Update to latest upstream release.
* Mon Jul 30 2012 Richard Shaw <hobbes1069(a)gmail.com> - 0.25.2-1
- Update to latests release.
11 years, 4 months
rpms/VirtualBox/devel .cvsignore, 1.41, 1.42 VirtualBox.spec, 1.32, 1.33 sources, 1.41, 1.42
by Sérgio M. Basto
Author: sergiomb
Update of /cvs/free/rpms/VirtualBox/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv7836
Modified Files:
.cvsignore VirtualBox.spec sources
Log Message:
* Mon Dec 24 2012 Sérgio Basto <sergio(a)serjux.com> - 4.2.4-1
- New upstream release.
- Fix some changelog dates.
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/VirtualBox/devel/.cvsignore,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- .cvsignore 28 Oct 2012 16:54:25 -0000 1.41
+++ .cvsignore 24 Dec 2012 18:30:21 -0000 1.42
@@ -1 +1 @@
-VirtualBox-4.2.4.tar.bz2
+VirtualBox-4.2.6.tar.bz2
Index: VirtualBox.spec
===================================================================
RCS file: /cvs/free/rpms/VirtualBox/devel/VirtualBox.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- VirtualBox.spec 2 Dec 2012 22:53:34 -0000 1.32
+++ VirtualBox.spec 24 Dec 2012 18:30:21 -0000 1.33
@@ -13,11 +13,11 @@
#global prerel RC4
%global prereltag %{?prerel:_%(awk 'BEGIN {print toupper("%{prerel}")}')}
-%if 0%{?fedora} < 18
+#if 0%{?fedora} < 20
%global enable_webservice 1
-%else
-%global enable_webservice 0
-%endif
+#else
+#global enable_webservice 0
+#endif
%if 0%{?fedora} < 18
%global enable_docs 1
@@ -26,8 +26,8 @@
%endif
Name: VirtualBox
-Version: 4.2.4
-Release: 3%{?prerel:.%{prerel}}%{?dist}
+Version: 4.2.6
+Release: 1%{?prerel:.%{prerel}}%{?dist}
Summary: A general-purpose full virtualizer for PC hardware
Group: Development/Tools
@@ -81,6 +81,7 @@
BuildRequires: libxml2-devel
BuildRequires: libpng-devel
BuildRequires: zlib-devel
+BuildRequires: device-mapper-devel
#BuildRequires: glibc(x86-32) glibc-devel(x86-32) libstdc++(x86-32)
#BuildRequires: glibc.i686 glibc-devel.i686 libstdc++.i686
#BuildRequires: /usr/lib/libc.so
@@ -607,6 +608,10 @@
%changelog
+* Mon Dec 24 2012 Sérgio Basto <sergio(a)serjux.com> - 4.2.4-1
+- New upstream release.
+- Fix some changelog dates.
+
* Sun Dec 02 2012 Sérgio Basto <sergio(a)serjux.com> - 4.2.4-3
- Use global variables enable_webservice and enable_docs to deal better with enable and disable that.
- Include fr UserManual.pdf and put this docs in /usr/share/docs (the right place) .
@@ -766,7 +771,7 @@
apply these fixes to VBox 4.1.10 as well." and add -lssl and -lcrypto by my self.
- drop Patch to allow to build with GCC 4.7
-* Tue Jan 15 2012 Sérgio Basto <sergio(a)serjux.com> - 4.1.8-4
+* Sun Jan 15 2012 Sérgio Basto <sergio(a)serjux.com> - 4.1.8-4
- Patch to allow to build with GCC 4.7
- Try fix usb/udev problem on updates without reboot computer.
- Improves on xorg17 patch, which is the xorg on guest part, we try build with our sources!.
@@ -925,18 +930,18 @@
- Exchange hardening for filesystem capabilities
- Enable web services
-* Sun Aug 08 2009 Lubomir Rintel <lkundrak(a)v3.sk> - 3.0.4-3
+* Sat Aug 08 2009 Lubomir Rintel <lkundrak(a)v3.sk> - 3.0.4-3
- Include VBoxRandR
- Add dri module to guest
- Resize attempts in GDM make SELinux unhappy
- Fix HAL policy file location
-* Sun Aug 08 2009 Lubomir Rintel <lkundrak(a)v3.sk> - 3.0.4-2
+* Sat Aug 08 2009 Lubomir Rintel <lkundrak(a)v3.sk> - 3.0.4-2
- Don't quote INSTALL_DIR in vbox.cfg so that we don't confuse vboxgtk
- Add python- subpackage
- Correct permissions on SDK directories (#754)
-* Sun Aug 08 2009 Lubomir Rintel <lkundrak(a)v3.sk> - 3.0.4-1
+* Sat Aug 08 2009 Lubomir Rintel <lkundrak(a)v3.sk> - 3.0.4-1
- Update to later upstream release
- Re-enable DRI again, fix drm_release crash
@@ -1092,7 +1097,7 @@
- Update to new version
- Adapt to new kBuild version, which seems to be needed
-* Wed Apr 21 2007 Till Maas <opensource till name> - 1.3.8-2
+* Sat Apr 21 2007 Till Maas <opensource till name> - 1.3.8-2
- minor bugfixes in the wrapper script
- rename to VirtualBox-OSE
Index: sources
===================================================================
RCS file: /cvs/free/rpms/VirtualBox/devel/sources,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- sources 28 Oct 2012 16:54:25 -0000 1.41
+++ sources 24 Dec 2012 18:30:21 -0000 1.42
@@ -1 +1 @@
-d1ec2d2a3f2f3f0b277dfe2c520c2e33 VirtualBox-4.2.4.tar.bz2
+d680aeb3b4379b8281527aeb012b2df5 VirtualBox-4.2.6.tar.bz2
11 years, 4 months
rpms/smplayer/F-16 smplayer-0.8.3-smtube-system-qtsingleapplication.patch, NONE, 1.1 .cvsignore, 1.16, 1.17 smplayer-0.8.1-system-qtsingleapplication.patch, 1.3, 1.4 smplayer.spec, 1.21, 1.22 sources, 1.18, 1.19
by Sérgio M. Basto
Author: sergiomb
Update of /cvs/free/rpms/smplayer/F-16
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv26883
Modified Files:
.cvsignore smplayer-0.8.1-system-qtsingleapplication.patch
smplayer.spec sources
Added Files:
smplayer-0.8.3-smtube-system-qtsingleapplication.patch
Log Message:
* Mon Dec 24 2012 Sérgio Basto <sergio(a)serjux.com> - 0.8.3-1
- New updates to smplayer-0.8.3 and smtube-1.5 . Fix for Youtube playback.
smplayer-0.8.3-smtube-system-qtsingleapplication.patch:
smtube.pro | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
--- NEW FILE smplayer-0.8.3-smtube-system-qtsingleapplication.patch ---
--- smtube-1.5/src/smtube.pro.qtsingleapplication 2012-11-30 16:46:02.000000000 +0000
+++ smtube-1.5/src/smtube.pro 2012-12-17 03:10:55.424870074 +0000
@@ -5,10 +5,11 @@
TEMPLATE = app
QT += network xml
TARGET =
-DEPENDPATH += . qtsingleapplication
-INCLUDEPATH += . qtsingleapplication
+DEPENDPATH += .
+INCLUDEPATH += .
CONFIG += qt warn_on release
+CONFIG += qtsingleapplication
RESOURCES = icons.qrc
@@ -65,10 +66,6 @@ TRANSLATIONS = translations/smtube_es.ts
translations/smtube_gl.ts \
translations/smtube_el.ts
-# qtsingleapplication
-SOURCES += qtsingleapplication.cpp qtlocalpeer.cpp
-HEADERS += qtsingleapplication.h qtlocalpeer.h
-
unix {
UI_DIR = .ui
MOC_DIR = .moc
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/smplayer/F-16/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore 17 Dec 2012 04:02:07 -0000 1.16
+++ .cvsignore 24 Dec 2012 13:53:19 -0000 1.17
@@ -1,2 +1,2 @@
-smplayer-0.8.2.1.tar.bz2
-smtube-1.4.tar.bz2
+smplayer-0.8.3.tar.bz2
+smtube-1.5.tar.bz2
smplayer-0.8.1-system-qtsingleapplication.patch:
smplayer.pro | 10 +---------
1 file changed, 1 insertion(+), 9 deletions(-)
Index: smplayer-0.8.1-system-qtsingleapplication.patch
===================================================================
RCS file: /cvs/free/rpms/smplayer/F-16/smplayer-0.8.1-system-qtsingleapplication.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- smplayer-0.8.1-system-qtsingleapplication.patch 17 Dec 2012 04:02:07 -0000 1.3
+++ smplayer-0.8.1-system-qtsingleapplication.patch 24 Dec 2012 13:53:20 -0000 1.4
@@ -1,30 +1,3 @@
---- smplayer-0.8.2.1/smtube-1.4/src/smtube.pro.qtsingleapplication 2012-11-30 16:46:02.000000000 +0000
-+++ smplayer-0.8.2.1/smtube-1.4/src/smtube.pro 2012-12-17 03:10:55.424870074 +0000
-@@ -5,10 +5,11 @@
- TEMPLATE = app
- QT += network xml
- TARGET =
--DEPENDPATH += . qtsingleapplication
--INCLUDEPATH += . qtsingleapplication
-+DEPENDPATH += .
-+INCLUDEPATH += .
-
- CONFIG += qt warn_on release
-+CONFIG += qtsingleapplication
-
- RESOURCES = icons.qrc
-
-@@ -65,10 +66,6 @@ TRANSLATIONS = translations/smtube_es.ts
- translations/smtube_gl.ts \
- translations/smtube_el.ts
-
--# qtsingleapplication
--SOURCES += qtsingleapplication.cpp qtlocalpeer.cpp
--HEADERS += qtsingleapplication.h qtlocalpeer.h
--
- unix {
- UI_DIR = .ui
- MOC_DIR = .moc
--- smplayer-0.8.1/src/smplayer.pro 2012-06-01 18:37:36.000000000 +0300
+++ smplayer-0.8.1/src/smplayer.pro 2012-09-20 13:11:52.937317532 +0300
@@ -3,6 +3,7 @@
Index: smplayer.spec
===================================================================
RCS file: /cvs/free/rpms/smplayer/F-16/smplayer.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- smplayer.spec 17 Dec 2012 04:02:08 -0000 1.21
+++ smplayer.spec 24 Dec 2012 13:53:20 -0000 1.22
@@ -1,7 +1,7 @@
-%global smtube_ver 1.4
+%global smtube_ver 1.5
Name: smplayer
-Version: 0.8.2.1
+Version: 0.8.3
Release: 1%{?dist}
Summary: A graphical frontend for mplayer
@@ -19,6 +19,7 @@
Patch0: smplayer-0.8.0-desktop-files.patch
Patch1: smplayer-0.8.1-system-quazip.patch
Patch2: smplayer-0.8.1-system-qtsingleapplication.patch
+Patch3: smplayer-0.8.3-smtube-system-qtsingleapplication.patch
BuildRequires: desktop-file-utils
BuildRequires: qt4-devel
@@ -48,6 +49,9 @@
%patch0 -p0 -b .desktop-files
%patch1 -p1 -b .quazip
%patch2 -p1 -b .qtsingleapplication
+pushd smtube-%{smtube_ver}
+%patch3 -p1 -b .qtsingleapplication
+popd
# correction for wrong-file-end-of-line-encoding
%{__sed} -i 's/\r//' *.txt
@@ -127,6 +131,9 @@
%{_datadir}/kde4/services/ServiceMenus/smplayer_enqueue.desktop
%changelog
+* Mon Dec 24 2012 Sérgio Basto <sergio(a)serjux.com> - 0.8.3-1
+- New updates to smplayer-0.8.3 and smtube-1.5 . Fix for Youtube playback.
+
* Mon Dec 17 2012 Sérgio Basto <sergio(a)serjux.com> - 0.8.2.1-1
- New updates to smplayer-0.8.2.1 and smtube-1.4 .
Index: sources
===================================================================
RCS file: /cvs/free/rpms/smplayer/F-16/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources 17 Dec 2012 04:02:08 -0000 1.18
+++ sources 24 Dec 2012 13:53:20 -0000 1.19
@@ -1,2 +1,2 @@
-3b3cad54b2f7f0026ab285de055bf40e smplayer-0.8.2.1.tar.bz2
-4c9a8bc54311408e479482798ee87a28 smtube-1.4.tar.bz2
+48755bffdff3878df32d8c047d7a3d52 smplayer-0.8.3.tar.bz2
+030327f3e9fbdf901967cf82c058fd1f smtube-1.5.tar.bz2
11 years, 4 months