rpms/mythtv/devel mythtv.spec,1.38,1.39 sources,1.19,1.20

[Jarod Wilson]

Author: jarod

Update of /cvs/free/rpms/mythtv/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv18646

Modified Files:
	mythtv.spec sources 
Log Message:
* Tue Aug 04 2009 Jarod Wilson <jarod at wilsonet.com> 0.22-0.2.svn.r21118
- Update to pre-0.22 svn trunk revision 21118
- Add infra for builds with vdpau support (need libvdpau in either
  Fedora or RPM Fusion before we can enable by default...)



Index: mythtv.spec
===================================================================
RCS file: /cvs/free/rpms/mythtv/devel/mythtv.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- mythtv.spec	15 Jun 2009 03:29:44 -0000	1.38
+++ mythtv.spec	4 Aug 2009 06:13:25 -0000	1.39
@@ -28,10 +28,11 @@
 # The following options are disabled by default.  Use these options to enable:
 #
 # --with directfb           Enable directfb support
+# --with xvmcnvidia         Enable NVidia XvMC support
+# --with vdpau              Enable NVidia VDPAU support
 #
 # The following options are enabled by default.  Use these options to disable:
 #
-# --without xvmcnvidia      Disable NVidia XvMC support
 # --without perl            Disable building of the perl bindings
 # --without python          Disable building of the python bindings
 #
@@ -60,7 +61,7 @@
 %define desktop_vendor  RPMFusion
 
 # SVN Revision number and branch ID
-%define _svnrev r20701
+%define _svnrev r21118
 %define branch trunk
 
 #
@@ -102,6 +103,7 @@
 # The following options are disabled by default.  Use --with to enable them
 %define with_directfb      %{?_with_directfb:       1} %{!?_with_directfb:      0}
 %define with_xvmcnvidia    %{?_with_xvmcnvidia:     1} %{?!_with_xvmcnvidia:    0}
+%define with_vdpau         %{?_with_vdpau:          1} %{?!_with_vdpau:         0}
 
 # All plugins get built by default, but you can disable them as you wish
 %define with_plugins        %{?_without_plugins:        0} %{!?_without_plugins:         1}
@@ -222,6 +224,10 @@
 BuildRequires:  xorg-x11-drv-nvidia-devel
 %endif
 
+%if %{with_vdpau}
+BuildRequires: libvdpau-devel
+%endif
+
 # API Build Requirements
 
 %if %{with_perl}
@@ -237,10 +243,6 @@
 
 %if %{with_plugins}
 
-%if %{with_mythbrowser}
-BuildRequires:  kdelibs3-devel
-%endif
-
 %if %{with_mythgallery}
 BuildRequires:  libtiff-devel
 BuildRequires:  libexif-devel >= 0.6.9
@@ -426,6 +428,10 @@
 Requires:  xorg-x11-drv-nvidia-devel
 %endif
 
+%if %{with_vdpau}
+Requires: libvdpau-devel
+%endif
+
 %description -n libmyth-devel
 This package contains the header files and libraries for developing
 add-ons for mythtv.
@@ -773,6 +779,7 @@
 Requires:  httpd >= 1.3.26
 Requires:  php >= 5.1
 Requires:  php-mysql
+Requires:  php-process
 
 %description -n mythweb
 The web interface to MythTV.
@@ -814,7 +821,7 @@
 ##### MythTV
 
 cd mythtv-%{version}
-%patch0 -p1
+#patch0 -p1
 
 # Drop execute permissions on contrib bits, since they'll be %doc
     find contrib/ -type f -exec chmod -x "{}" \;
@@ -919,16 +926,16 @@
     --enable-ivtv                               \
     --enable-firewire                           \
     --enable-dvb                                \
-    --enable-libfaac                            \
+    --enable-libfaac --enable-nonfree           \
     --enable-libfaad --enable-libfaad --enable-libfaadbin \
     --enable-libmp3lame                         \
     --enable-libtheora --enable-libvorbis       \
     --enable-libxvid                            \
 %if %{with_xvmcnvidia}
     --xvmc-lib=XvMCNVIDIA_dynamic               \
-    --enable-xvmc-opengl                        \
-%else
-    --disable-xvmc-opengl                       \
+%endif
+%if %{with_vdpau}
+    --enable-vdpau				\
 %endif
 %if %{with_directfb}
     --enable-directfb                           \
@@ -1333,8 +1340,7 @@
 %doc mythplugins-%{version}/mythbrowser/AUTHORS
 %doc mythplugins-%{version}/mythbrowser/COPYING
 %doc mythplugins-%{version}/mythbrowser/README
-%{_bindir}/mythbrowser
-%{_libdir}/mythtv/plugins/libmythbookmarkmanager.so
+%{_libdir}/mythtv/plugins/libmythbrowser.so
 %{_datadir}/mythtv/i18n/mythbrowser_*.qm
 %endif
 
@@ -1466,6 +1472,15 @@
 ################################################################################
 
 %changelog
+* Tue Aug 04 2009 Jarod Wilson <jarod at wilsonet.com> 0.22-0.2.svn.r21118
+- Update to pre-0.22 svn trunk revision 21118
+- Add infra for builds with vdpau support (need libvdpau in either
+  Fedora or RPM Fusion before we can enable by default...)
+
+* Sat Jun 20 2009 Jarod Wilson <jarod at wilsonet.com> 0.22-0.2.svn.r20728
+- Update to pre-0.22 svn trunk revision 20728
+- Drop BR: kdelibs3-devel, MythBrowser ported to qt4 now (rfbz#626)
+
 * Sun Jun 14 2009 Jarod Wilson <jarod at wilsonet.com> 0.22-0.2.svn.r20701
 - Update to pre-0.22 svn trunk revision 20701
 


Index: sources
===================================================================
RCS file: /cvs/free/rpms/mythtv/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	15 Jun 2009 03:29:44 -0000	1.19
+++ sources	4 Aug 2009 06:13:25 -0000	1.20
@@ -1,4 +1,4 @@
 be3ab99952c2a3a135a7c4af90b08f15  mythfrontend.png
 be3ab99952c2a3a135a7c4af90b08f15  mythtv-setup.png
-80c40baef70936de0e7fed3213180023  mythtv-0.22.tar.bz2
-d5217919d5e849f29aa74b616676eef5  mythplugins-0.22.tar.bz2
+d2632857fe5de49f01388db8689592df  mythplugins-0.22.tar.bz2
+329bda54b58251af98b48d3d32989fd6  mythtv-0.22.tar.bz2