Author: glen Date: Wed Nov 16 21:20:26 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- unfinished update to 0.24.1
---- Files affected:
packages/mythtv:
mythtv-compile_fixes_for_qt_4_7.patch (1.1 -> 1.2) , mythtv-sbinpath.patch
(1.4 -> 1.5) , mythtv.spec (1.109 -> 1.110)
---- Diffs:
================================================================
Index: packages/mythtv/mythtv-compile_fixes_for_qt_4_7.patch
diff -u packages/mythtv/mythtv-compile_fixes_for_qt_4_7.patch:1.1
packages/mythtv/mythtv-compile_fixes_for_qt_4_7.patch:1.2
--- packages/mythtv/mythtv-compile_fixes_for_qt_4_7.patch:1.1 Fri Sep 24
14:24:39 2010
+++ packages/mythtv/mythtv-compile_fixes_for_qt_4_7.patch Wed Nov 16
22:20:20 2011
@@ -1,58 +1,7 @@
---
- libs/libmyth/mythdeque.h | 2 1 + 1 - 0 !
- libs/libmythtv/recordingprofile.h | 2 1 + 1 - 0 !
libs/libmythtv/tv_rec.h | 2 1 + 1 - 0 !
- libs/libmythupnp/eventing.h | 4 2 + 2 - 0 !
5 files changed, 6 insertions(+), 6 deletions(-)
-Index: mythtv/libs/libmythupnp/eventing.h
-===================================================================
---- mythtv.orig/libs/libmythupnp/eventing.h 2010-01-10 08:49:06.000000000
-0500
-+++ mythtv/libs/libmythupnp/eventing.h 2010-07-01 22:34:54.000000000 -0400
-@@ -233,7 +233,7 @@
- {
- SVMap::iterator it = m_map.find(sName);
- if (it == m_map.end())
-- return T(0);
-+ return T();
-
- StateVariable< T > *pVariable =
- dynamic_cast< StateVariable< T > *>( *it );
-@@ -241,7 +241,7 @@
- if (pVariable != NULL)
- return pVariable->GetValue();
-
-- return T(0);
-+ return T();
- }
-
- uint BuildNotifyBody(QTextStream &ts, TaskTime ttLastNotified) const;
-Index: mythtv/libs/libmyth/audiooutputbase.cpp
-===================================================================
---- mythtv.orig/libs/libmyth/mythdeque.h 2009-09-11 15:07:19.000000000
-0400
-+++ mythtv/libs/libmyth/mythdeque.h 2010-07-01 22:34:54.000000000 -0400
-@@ -19,7 +19,7 @@
- T dequeue()
- {
- if (deque<T>::empty())
-- return (T)(0);
-+ return T();
- T item = deque<T>::front();
- deque<T>::pop_front();
- return item;
-Index: mythtv/libs/libmythtv/recordingprofile.h
-===================================================================
---- mythtv.orig/libs/libmythtv/recordingprofile.h 2010-05-16
14:58:08.000000000 -0400
-+++ mythtv/libs/libmythtv/recordingprofile.h 2010-07-01 22:34:54.000000000
-0400
-@@ -84,7 +84,7 @@
-
- public:
- // initializers
-- RecordingProfile(QString profName = NULL);
-+ RecordingProfile(QString profName = QString());
- virtual void loadByID(int id);
- virtual bool loadByType(const QString &name, const QString &cardtype);
- virtual bool loadByGroup(const QString &name, const QString &group);
Index: mythtv/libs/libmythtv/tv_rec.h
===================================================================
--- mythtv.orig/libs/libmythtv/tv_rec.h 2010-05-16 14:58:08.000000000
-0400
================================================================
Index: packages/mythtv/mythtv-sbinpath.patch
diff -u packages/mythtv/mythtv-sbinpath.patch:1.4
packages/mythtv/mythtv-sbinpath.patch:1.5
--- packages/mythtv/mythtv-sbinpath.patch:1.4 Tue Oct 20 01:53:36 2009
+++ packages/mythtv/mythtv-sbinpath.patch Wed Nov 16 22:20:20 2011
@@ -22,18 +22,6 @@
command = QString("%1 -j %2 -V %3")
.arg(path).arg(jobID).arg(print_verbose_messages);
}
-diff -urN mythtv-0.22rc1.orig/libs/libmythtv/previewgenerator.cpp
mythtv-0.22rc1/libs/libmythtv/previewgenerator.cpp
---- mythtv-0.22rc1.orig/libs/libmythtv/previewgenerator.cpp 2009-09-29
15:49:11.000000000 +0200
-+++ mythtv-0.22rc1/libs/libmythtv/previewgenerator.cpp 2009-10-18
18:55:54.000000000 +0200
-@@ -224,7 +224,7 @@
- {
- // This is where we fork and run mythbackend to actually make preview
- QString command = GetInstallPrefix() +
-- "/bin/mythbackend --generate-preview ";
-+ "/sbin/mythbackend --generate-preview ";
- command += QString("%1x%2")
- .arg(outSize.width()).arg(outSize.height());
- if (captureTime >= 0)
diff -urN mythtv-0.22rc1.orig/programs/mythbackend/mythbackend.pro
mythtv-0.22rc1/programs/mythbackend/mythbackend.pro
--- mythtv-0.22rc1.orig/programs/mythbackend/mythbackend.pro 2009-07-17
23:08:07.000000000 +0200
+++ mythtv-0.22rc1/programs/mythbackend/mythbackend.pro 2009-10-18
18:55:54.000000000 +0200
================================================================
Index: packages/mythtv/mythtv.spec
diff -u packages/mythtv/mythtv.spec:1.109 packages/mythtv/mythtv.spec:1.110
--- packages/mythtv/mythtv.spec:1.109 Tue Mar 29 11:28:05 2011
+++ packages/mythtv/mythtv.spec Wed Nov 16 22:20:20 2011
@@ -5,6 +5,11 @@
# - alpha, sparc, ppc arches?
# - http://outflux.net/software/pkgs/mythtvfs-fuse/
# - vaapi support - check for compatible versions of libva?
+# - bindings:
+# WARNING: disabling Python bindings; missing MySQLdb
+# WARNING: disabling Perl bindings; missing Net::UPnP::QueryResponse
+# WARNING: disabling Perl bindings; missing Net::UPnP::ControlPoint
+# - dozen of unpackaged files
#
# Specfile for MythTV
#
@@ -33,6 +38,8 @@
%bcond_with vaapi # enable vaapi
%bcond_with dshowserver # enable directshow codecs server
%bcond_with directfb
+%bcond_with perl
+%bcond_with python
%bcond_with nvidia_headers # build vdpau support with nvidia headers
# instead of libvdpau
@@ -52,12 +59,12 @@
Summary: A personal video recorder (PVR) application
Summary(pl.UTF-8): Osobista aplikacja do nagrywania obrazu (PVR)
Name: mythtv
-Version: 0.23.1
-Release: 5
+Version: 0.24.1
+Release: 0.1
License: GPL v2
Group: Applications/Multimedia
Source0: ftp://ftp.osuosl.org/pub/mythtv/%{name}-%{version}.tar.bz2
-# Source0-md5: 3379a5fd12ae866cd10c5b5d23439898
+# Source0-md5: 6870c679619ec58456e76839745411d8
Source1: mythbackend.sysconfig
Source2: mythbackend.init
Source3: mythbackend.logrotate
@@ -124,6 +131,11 @@
%define myth_api_version %(echo %{version} | cut -d. -f1,2)
+# libmythavdevice.so.52.2.1 missing -l???: sem_init sem_destroy sem_post
sem_timedwait
+# libmythavcodec.so.52.86.1 missing -lpthread: pthread_create pthread_join
+%define skip_post_check_so libmythavdevice.so
libmythavcodec.so
+%define no_install_post_check_so 1
+
%description
MythTV implements the following PVR features, and more, with a unified
graphical interface:
@@ -333,10 +345,9 @@
%patch0 -p1
%patch10 -p1
-%patch20 -p1
+%{?with_dshowserver:%patch20 -p1}
#%patch30 -p1
-%{?with_dshowserver:%patch20 -p0}
rm -rf database/old # not supported in PLD
# lib64 fix - enable to update patch
@@ -385,7 +396,7 @@
# move perl bindings to vendor prefix
sed -i -e 's#perl Makefile.PL#%{__perl} Makefile.PL INSTALLDIRS=vendor
OPTIMIZE="$RPM_OPT_FLAGS"#' \
- bindings/perl/perl.pro
+ bindings/perl/Makefile
%build
@@ -443,7 +454,7 @@
--enable-xv \
--enable-x11 \
-%{_libdir}/qt4/bin/qmake mythtv.pro
+#%{_libdir}/qt4/bin/qmake mythtv.pro
%{__make}
%install
@@ -460,10 +471,10 @@
INSTALL_ROOT=$RPM_BUILD_ROOT
# Install the files that we added on top of mythtv's own stuff
-install %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/mythbackend
-install %{SOURCE3} $RPM_BUILD_ROOT/etc/logrotate.d/mythbackend
-install %{SOURCE1} $RPM_BUILD_ROOT/etc/sysconfig/mythbackend
-%{?with_dshowserver:install %{SOURCE20} $RPM_BUILD_ROOT%{_datadir}/mythtv}
+install -p %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/mythbackend
+cp -p %{SOURCE3} $RPM_BUILD_ROOT/etc/logrotate.d/mythbackend
+cp -p %{SOURCE1} $RPM_BUILD_ROOT/etc/sysconfig/mythbackend
+%{?with_dshowserver:cp -p %{SOURCE20} $RPM_BUILD_ROOT%{_datadir}/mythtv}
# desktop entries
install %{SOURCE5} $RPM_BUILD_ROOT%{_desktopdir}
@@ -567,7 +578,7 @@
%dir %{_libdir}/mythtv/filters
%dir %{_libdir}/mythtv/plugins
%attr(755,root,root) %{_libdir}/mythtv/filters/*.so
-%{_datadir}/mythtv/*.ttf
+%{_datadir}/mythtv/fonts/*.ttf
%dir %{_datadir}/mythtv/i18n
%if %{with dshowserver}
%{_datadir}/mythtv/dshowcodecs
@@ -599,6 +610,7 @@
%files -n libmyth-static
%defattr(644,root,root,755)
+%if %{with perl}
%files -n perl-MythTV
%defattr(644,root,root,755)
%{perl_vendorlib}/MythTV.pm
@@ -607,13 +619,16 @@
%dir %{perl_vendorlib}/IO/Socket/INET
%{perl_vendorlib}/IO/Socket/INET/MythTV.pm
%exclude %{perl_vendorarch}/auto/MythTV/.packlist
+%endif
+%if %{with python}
%files -n python-MythTV
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/mythpython
%dir %{py_sitescriptdir}/MythTV
%{py_sitescriptdir}/MythTV/*
%{py_sitescriptdir}/*.egg-info
+%endif
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
%changelog
@@ -621,6 +636,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.110 2011/11/16 21:20:20 glen
+- unfinished update to 0.24.1
+
Revision 1.109 2011/03/29 09:28:05 baggins
- rel 5
- include macros.perl and BR:rpm-perlprov
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mythtv/mythtv-compile_fixes_for_qt_4_7.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mythtv/mythtv-sbinpath.patch?r1=1.4&r2=1.5&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mythtv/mythtv.spec?r1=1.109&r2=1.110&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
