Author: jarod
Update of /cvs/free/rpms/mythtv/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv32662
Modified Files:
mythtv.spec sources
Log Message:
* Sun Aug 29 2010 Jarod Wilson <jarod(a)wilsonet.com> 0.24-0.1.svn.r25946
- Update to svn trunk, revision 25946
- Add new crystalhd dependency
Index: mythtv.spec
===================================================================
RCS file: /cvs/free/rpms/mythtv/devel/mythtv.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- mythtv.spec 16 Aug 2010 03:36:50 -0000 1.72
+++ mythtv.spec 29 Aug 2010 19:31:12 -0000 1.73
@@ -36,6 +36,7 @@
# The following options are enabled by default. Use these options to disable:
#
# --without vdpau Disable VDPAU support
+# --without crystalhd Disable Crystal HD support
# --without xvmc Disable XvMC support
# --without perl Disable building of the perl bindings
# --without python Disable building of the python bindings
@@ -64,7 +65,7 @@
%define desktop_vendor RPMFusion
# SVN Revision number and branch ID
-%define _svnrev r25695
+%define _svnrev r25946
%define branch trunk
#
@@ -101,6 +102,7 @@
# The following options are enabled by default. Use --without to disable them
%define with_vdpau %{?_without_vdpau: 0} %{?!_without_vdpau: 1}
+%define with_crystalhd %{?_without_crystalhd: 0} %{?!_without_crystalhd: 1}
%define with_xvmc %{?_without_xvmc: 0} %{?!_without_xvmc: 1}
%define with_perl %{?_without_perl: 0} %{!?_without_perl: 1}
%define with_python %{?_without_python: 0} %{!?_without_python: 1}
@@ -192,7 +194,6 @@
%if %{with_faac}
BuildRequires: faac-devel
%endif
-BuildRequires: faad2-devel
BuildRequires: fftw-devel >= 3
BuildRequires: flac-devel >= 1.0.4
BuildRequires: gsm-devel
@@ -235,6 +236,10 @@
BuildRequires: libvdpau-devel
%endif
+%if %{with_crystalhd}
+BuildRequires: libcrystalhd-devel
+%endif
+
# API Build Requirements
%if %{with_perl}
@@ -422,7 +427,6 @@
%if %{with_faac}
Requires: faac-devel
%endif
-Requires: faad2-devel
Requires: fftw-devel >= 3
Requires: flac-devel >= 1.0.4
Requires: gsm-devel
@@ -464,6 +468,10 @@
Requires: libvdpau-devel
%endif
+%if %{with_crystalhd}
+Requires: libcrystalhd-devel
+%endif
+
%description devel
This package contains the header files and libraries for developing
add-ons for mythtv.
@@ -861,7 +869,7 @@
# Put perl bits in the right place and set opt flags
sed -i -e 's#perl Makefile.PL#%{__perl} Makefile.PL INSTALLDIRS=vendor
OPTIMIZE="$RPM_OPT_FLAGS"#' \
- bindings/perl/perl.pro
+ bindings/perl/Makefile
# Install other source files, and fix pathnames
cp -a %{SOURCE10} %{SOURCE101} %{SOURCE102} %{SOURCE103} .
@@ -958,13 +966,15 @@
%if %{with_faac}
--enable-libfaac --enable-nonfree \
%endif
- --enable-libfaad --enable-libfaadbin \
--enable-libmp3lame \
--enable-libtheora --enable-libvorbis \
--enable-libxvid \
%if %{with_vdpau}
--enable-vdpau \
%endif
+%if %{with_crystalhd}
+ --enable-crystalhd \
+%endif
%if !%{with_xvmc}
--disable-xvmcw \
%endif
@@ -1431,7 +1441,6 @@
%{_datadir}/mythtv/video_settings.xml
%{_datadir}/mythtv/videomenu.xml
%{_localstatedir}/lib/mythvideo
-%{_bindir}/mtd
%endif
%if %{with_mythweather}
@@ -1443,7 +1452,8 @@
%{_libdir}/mythtv/plugins/libmythweather.so
%{_datadir}/mythtv/i18n/mythweather_*.qm
%{_datadir}/mythtv/weather_settings.xml
-%{_datadir}/mythtv/mythweather
+%dir %{_datadir}/mythtv/mythweather
+%{_datadir}/mythtv/mythweather/*
%endif
%if %{with_mythweb}
@@ -1483,6 +1493,10 @@
################################################################################
%changelog
+* Sun Aug 29 2010 Jarod Wilson <jarod(a)wilsonet.com> 0.24-0.1.svn.r25946
+- Update to svn trunk, revision 25946
+- Add new crystalhd dependency
+
* Sun Aug 15 2010 Jarod Wilson <jarod(a)wilsonet.com> 0.24-0.1.svn.r25695
- Update to svn trunk, revision 25695
- Account for qt/qt-webkit split on F14
Index: sources
===================================================================
RCS file: /cvs/free/rpms/mythtv/devel/sources,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- sources 16 Aug 2010 03:36:50 -0000 1.46
+++ sources 29 Aug 2010 19:31:12 -0000 1.47
@@ -1,4 +1,4 @@
be3ab99952c2a3a135a7c4af90b08f15 mythfrontend.png
be3ab99952c2a3a135a7c4af90b08f15 mythtv-setup.png
-feb4ee73863e51b7a1794f9cd5d3f6f4 mythplugins-0.24.tar.bz2
-2d3bd5384303bef3ac1a477562c4cf43 mythtv-0.24.tar.bz2
+41f4bee41d2bcb824cbc41c547c1c6b8 mythplugins-0.24.tar.bz2
+c0096d14c2012ab2bfe8fda06b13f7ef mythtv-0.24.tar.bz2