[users] smplayer-0.6.9

Alfred Ganz alfred-ganz+dag at agci.com
Thu Dec 9 15:32:28 CET 2010


Dag,

Yury suggested that I should send this to the list, so here it is.

I have fiddled some more with the latest smplayer source. I believe I
now have a reasonable set of patches for you to use, if you have the
time and inclination to make a new release of smplayer.

Here is what I have done:
 * one of Yury's patches for 0.6.8 caused some minor problems when
   applied to the new source. Since the problem was just two numbers
   that had been changed, I decided to modify the patch itself.
   The new version of the patch is called smplayer-0.6.9-el5-ui-zyv.patch
   and is based on smplayer-0.6.8-el5-ui-zyv.patch. I will attach a
   patch file for these changes, smplayer-0.6.8-el5-ui-zyv.patch.patch
   The other of Yury's patches applied without problems.
 * The new version of smplayer provides for an additional user
   interface for a new log file. The new user interface definition
   needs to be adapted to the proper qt4 interface (this just mimicks
   what Yury's patch does many times). I have decided to make a separate
   patch for this, the changes look much simpler this way. The new patch
   is called smplayer-0.6.9-el5-ui-ag.patch (so inventive!).
 * The Help interface for the current smplayer doesn't properly display
   the FAQ and GPL texts. This is because the smplayer.spec file doesn't
   pass an appropriate DOC_PATH at compile time. I have modified the
   spec file to provide for this parameter. Don't ask me why it needs
   the double escapes around it, but things don't work out without those.
   There is a patch for SPECS/smplayer.spec which works against the
   0.6.8 smpalyer.spec. Note, this will need to be adapted for rpmforge
   standards.

Hope this helps, AG

-- 
 ----------------------------------------------------------------------
   Alfred Ganz					alfred-ganz:at:agci.com
   AG Consulting, Inc.				(203) 624-9667
   440 Prospect Street # 11
   New Haven, CT 06511
 ----------------------------------------------------------------------
-------------- next part --------------
--- SOURCES/smplayer-0.6.8-el5-ui-zyv.patch	2009-08-07 11:51:35.000000000 -0400
+++ SOURCES/smplayer-0.6.9-el5-ui-zyv.patch	2010-12-08 23:02:09.000000000 -0500
@@ -212,7 +212,7 @@
      <y>0</y>
 -    <width>511</width>
 +    <width>529</width>
-     <height>466</height>
+     <height>469</height>
     </rect>
    </property>
    <layout class="QVBoxLayout" >
@@ -749,7 +749,7 @@
      <x>0</x>
      <y>0</y>
 -    <width>486</width>
--    <height>503</height>
+-    <height>533</height>
 +    <width>504</width>
 +    <height>538</height>
     </rect>
-------------- next part --------------
--- smplayer-0.6.9.orig/src/prefadvanced.ui	2010-12-08 23:03:00.000000000 -0500
+++ smplayer-0.6.9/src/prefadvanced.ui	2010-12-08 23:09:06.000000000 -0500
@@ -566,17 +566,11 @@
           <bool>false</bool>
          </property>
          <layout class="QHBoxLayout" >
-          <property name="leftMargin" >
-           <number>0</number>
-          </property>
-          <property name="topMargin" >
-           <number>0</number>
-          </property>
-          <property name="rightMargin" >
-           <number>0</number>
+          <property name="margin" >
+           <number>9</number>
           </property>
-          <property name="bottomMargin" >
-           <number>0</number>
+          <property name="spacing" >
+           <number>6</number>
           </property>
           <item>
            <spacer>
-------------- next part --------------
--- smplayer-6.8.spec.orig	2009-08-11 19:36:45.000000000 -0400
+++ SPECS/smplayer.spec	2010-12-08 23:55:29.000000000 -0500
@@ -4,8 +4,8 @@
 
 Summary: Frontend for mplayer
 Name: smplayer
-Version: 0.6.8
-Release: 1.rf
+Version: 0.6.9
+Release: 1.ag
 License: GPL
 Group: Applications/Multimedia
 URL: http://smplayer.berlios.de/
@@ -16,12 +16,16 @@
 Source: http://dl.sf.net/smplayer/smplayer-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Patch0: smplayer-0.6.8-el5-logic-zyv.patch
-Patch1: smplayer-0.6.8-el5-ui-zyv.patch
+Patch1: smplayer-0.6.9-el5-ui-zyv.patch
+Patch2: smplayer-0.6.9-el5-ui-ag.patch
 
 BuildRequires: gcc-c++
 BuildRequires: qt4-devel
 Requires: mplayer
 
+##AG## This must be available, but I dont know where
+%define my_doc %{_docdir}/%{name}-%{version}
+
 %description
 SMPlayer intends to be a complete front-end for MPlayer, from basic features 
 like playing videos, DVDs, and VCDs to more advanced features like support 
@@ -34,15 +38,18 @@
 %setup
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 export PATH="%{_libdir}/qt4/bin:$PATH"
-%{__make} %{?_smp_mflags} PREFIX="%{_prefix}"
+%{__make} %{?_smp_mflags} PREFIX="%{_prefix}" DOC_PATH="\\\"%{my_doc}\\\""
+##AG## %{__make} %{?_smp_mflags} PREFIX="%{_prefix}"
 
 %install
 %{__rm} -rf %{buildroot}
-%{__make} install DESTDIR="%{buildroot}" PREFIX="%{_prefix}"
-%{__mv} %{buildroot}%{_docdir}/packages/smplayer rpmdocs
+%{__make} install DESTDIR="%{buildroot}" PREFIX="%{_prefix}" DOC_PATH="%{my_doc}"
+##AG## %{__make} install DESTDIR="%{buildroot}" PREFIX="%{_prefix}"
+##AG## %{__mv} %{buildroot}%{_docdir}/packages/smplayer rpmdocs
 
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
@@ -52,7 +59,7 @@
 
 %files
 %defattr(-, root, root, 0755)
-%doc rpmdocs/*
+%doc %{my_doc}/*
 %doc %{_mandir}/man1/smplayer.1*
 %{_bindir}/smplayer
 %{_datadir}/applications/smplayer*.desktop
@@ -60,7 +67,12 @@
 %{_datadir}/smplayer/
 
 %changelog
-* Fri Jul 31 2009 Yury V. Zaytsev <yury at shurup.com> - 0.6.8-1 - 7599/yury
+* Wed Dec  8 2010 Alfred Ganz <alfred-ganz+dag at agci.com> - 0.6.9-1
+- Modify smplayer-0.6.8-el5-ui-zyv.patch to reflect changes to source
+- Add new patch to modify log_smplayer user interface (new in the source)
+- Modify smplayer.spec to use proper DOC_PATH during build and install
+
+* Fri Jul 31 2009 Yury V. Zaytsev <yury at shurup.com> - 0.6.8-1 - 7981/dag
 - New patches for CentOS 5 for smplayer 0.6.8 (HTTPS & Socks5 disabled).
 
 * Wed Feb 11 2009 Yury V. Zaytsev <yury at shurup.com> - 0.6.6-1


More information about the users mailing list