packages: libstk/libstk-fixes.patch, libstk/libstk.spec, libstk/libstk-xine...

qboosh qboosh at pld-linux.org
Sat Feb 25 19:55:17 CET 2012 

Author: qboosh                       Date: Sat Feb 25 18:55:17 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to latest git snapshot (20070719 - the day of the last commit)
- one more fix added to fixes patch
- added xine patch to fix build with xine-lib 1.2
- added xsl patch to allow process docbook XML source on PLD

---- Files affected:
packages/libstk:
   libstk-fixes.patch (1.8 -> 1.9) , libstk.spec (1.72 -> 1.73) , libstk-xine.patch (NONE -> 1.1)  (NEW), libstk-xsl.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/libstk/libstk-fixes.patch
diff -u packages/libstk/libstk-fixes.patch:1.8 packages/libstk/libstk-fixes.patch:1.9
--- packages/libstk/libstk-fixes.patch:1.8	Thu Oct  2 08:48:04 2008
+++ packages/libstk/libstk-fixes.patch	Sat Feb 25 19:55:11 2012
@@ -75,3 +75,13 @@
              surface_ = NULL;
          }
  
+--- dvhart-libstk-6186fff/libstk/surface_dfb.cpp.orig	2007-07-19 10:46:21.000000000 +0200
++++ dvhart-libstk-6186fff/libstk/surface_dfb.cpp	2012-02-25 12:26:42.798505374 +0100
+@@ -16,7 +16,6 @@
+ #include "logging.h"
+ #include <iostream>
+ 
+-#include "utility.h"
+ 
+ namespace stk
+ {

================================================================
Index: packages/libstk/libstk.spec
diff -u packages/libstk/libstk.spec:1.72 packages/libstk/libstk.spec:1.73
--- packages/libstk/libstk.spec:1.72	Wed Feb 15 10:07:05 2012
+++ packages/libstk/libstk.spec	Sat Feb 25 19:55:11 2012
@@ -9,11 +9,12 @@
 #	4. make-request -r xine-lib
 #
 # Conditional build:
-%bcond_without	static_libs 	# build without static libraries
-%bcond_without	xine		# build without xine support
+%bcond_without	static_libs 	# static library
+%bcond_without	xine		# XINE support
+%bcond_without	apidocs		# API/internal docs in HTML format
 #
-%define		snap	20061117
-%define		rel	44
+%define		snap	20070719
+%define		rel	1
 Summary:	LibSTK - graphical widget set written in C++
 Summary(pl.UTF-8):	LibSTK - zbiór graficznych widgetów napisany w C++
 Name:		libstk
@@ -21,11 +22,14 @@
 Release:	0.%{snap}.%{rel}
 License:	Libstk Library License (relaxed LGPL)
 Group:		Libraries
+# https://github.com/dvhart/libstk/tarball/master snapshotted after last commit on %{snap}
 #Source0:	http://www.libstk.net/sites/www.libstk.net/files/%{name}-%{snap}.tar.gz
-Source0:	%{name}-%{snap}.tar.bz2
-# Source0-md5:	350c5e47de8a54d19372bcf6ca926540
+Source0:	%{name}-%{snap}.tar.gz
+# Source0-md5:	59ecdb5f78298896a415abe05855b62e
 Patch0:		%{name}-fixes.patch
 Patch1:		%{name}-am.patch
+Patch2:		%{name}-xine.patch
+Patch3:		%{name}-xsl.patch
 URL:		http://www.libstk.net/
 BuildRequires:	DirectFB-devel
 BuildRequires:	SDL-devel >= 1.2.0
@@ -37,7 +41,14 @@
 BuildRequires:	libpng-devel
 BuildRequires:	libtool >= 2:1.5
 BuildRequires:	pkgconfig
-%{?with_xine:BuildRequires:	xine-lib-devel}
+%{?with_xine:BuildRequires:	xine-lib-devel >= 2:1.2}
+%if %{with apidocs}
+BuildRequires:	docbook-dtd42-xml
+BuildRequires:	docbook-style-xsl
+BuildRequires:	graphviz
+BuildRequires:	libxml2-progs
+BuildRequires:	libxslt-progs
+%endif
 Requires:	fonts-TTF-bitstream-vera
 %{?with_xine:Provides:	%{name}(xine) = %{version}-%{release}}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -67,7 +78,7 @@
 Requires:	freetype-devel >= 2.0
 Requires:	libjpeg-devel
 Requires:	libpng-devel
-%{?with_xine:Requires:	xine-lib-devel}
+%{?with_xine:Requires:	xine-lib-devel >= 2:1.2}
 
 %description devel
 Header files for LibSTK library.
@@ -88,9 +99,13 @@
 Statyczna biblioteka LibSTK.
 
 %prep
-%setup -q -n %{name}-%{snap}
+%setup -q -n dvhart-libstk-6186fff
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
+%patch3 -p1
+
+%{__rm} doc/images/doc_images_go_here
 
 %build
 %{__libtoolize}
@@ -109,6 +124,13 @@
 
 %{__make}
 
+%if %{with apidocs}
+cd doc
+./process_xml.sh
+mv -f output html
+mv -f images html
+%endif
+
 %install
 rm -rf $RPM_BUILD_ROOT
 
@@ -120,7 +142,10 @@
 	%{__rm} "$FONT"
 	ln -s %{_datadir}/fonts/TTF/"$FONT" "$FONT"
 done
-rm copyright
+%{__rm} copyright
+
+# just tests, don't package them
+%{__rm} $RPM_BUILD_ROOT%{_bindir}/{hello_world,hydra,test_app,test_area,timer_test,xine_test}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -137,10 +162,10 @@
 
 %files devel
 %defattr(644,root,root,755)
-%doc doc/*
+%doc doc/{dvhart_carter_architecture.txt,irc_*.txt,uml.jpg,widget_tree.txt} %{?with_apidocs:doc/html}
 %attr(755,root,root) %{_libdir}/libstk.so
 %{_libdir}/libstk.la
-%{_includedir}/libstk-*
+%{_includedir}/libstk-0.2.0
 %{_pkgconfigdir}/libstk.pc
 
 %if %{with static_libs}
@@ -155,6 +180,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.73  2012/02/25 18:55:11  qboosh
+- updated to latest git snapshot (20070719 - the day of the last commit)
+- one more fix added to fixes patch
+- added xine patch to fix build with xine-lib 1.2
+- added xsl patch to allow process docbook XML source on PLD
+
 Revision 1.72  2012/02/15 09:07:05  arekm
 - release 44
 

================================================================
Index: packages/libstk/libstk-xine.patch
diff -u /dev/null packages/libstk/libstk-xine.patch:1.1
--- /dev/null	Sat Feb 25 19:55:17 2012
+++ packages/libstk/libstk-xine.patch	Sat Feb 25 19:55:11 2012
@@ -0,0 +1,64 @@
+--- dvhart-libstk-6186fff/libstk/xine_panel.cpp.orig	2007-07-19 10:46:21.000000000 +0200
++++ dvhart-libstk-6186fff/libstk/xine_panel.cpp	2012-02-25 17:35:13.409125178 +0100
+@@ -51,8 +51,8 @@
+ 
+         xp->xine_event_queue_ = xine_event_new_queue(xp->xine_stream_);
+         xine_event_create_listener_thread(xp->xine_event_queue_, &event_listener_wrapper, (void*)xp.get());
+-        xine_gui_send_vo_data(xp->xine_stream_, XINE_GUI_SEND_DRAWABLE_CHANGED, (void*)xp.get());
+-        xine_gui_send_vo_data(xp->xine_stream_, XINE_GUI_SEND_VIDEOWIN_VISIBLE, (void*)1);
++        xine_port_send_gui_data(xp->xine_vo_port_, XINE_GUI_SEND_DRAWABLE_CHANGED, (void*)xp.get());
++        xine_port_send_gui_data(xp->xine_vo_port_, XINE_GUI_SEND_VIDEOWIN_VISIBLE, (void*)1);
+ 
+         // fixme: what's the best way to do this - we didn't want to use public signals for library stuff
+         xp->on_resize.connect(boost::function<bool()>((boost::bind(&xine_panel::drawable_changed, xp.get()), true)));
+@@ -230,10 +230,9 @@
+             surface->fill_rect(vid_rect.intersection(clip_rect));
+         }
+ 
+-        // FIXME: these are deprecated, use: xine_port_send_gui_data(...)
+-        xine_gui_send_vo_data(xine_stream_, XINE_GUI_SEND_DRAWABLE_CHANGED, (void*)this);
+-        xine_gui_send_vo_data(xine_stream_, XINE_GUI_SEND_VIDEOWIN_VISIBLE, (void*)1);
+-        xine_gui_send_vo_data(xine_stream_, XINE_GUI_SEND_EXPOSE_EVENT, NULL);
++        xine_port_send_gui_data(xine_vo_port_, XINE_GUI_SEND_DRAWABLE_CHANGED, (void*)this);
++        xine_port_send_gui_data(xine_vo_port_, XINE_GUI_SEND_VIDEOWIN_VISIBLE, (void*)1);
++        xine_port_send_gui_data(xine_vo_port_, XINE_GUI_SEND_EXPOSE_EVENT, NULL);
+     }
+ 
+     void xine_panel::event_listener_wrapper(void *user_data, const xine_event_t *xine_event) 
+@@ -263,8 +262,8 @@
+ 
+     void xine_panel::drawable_changed()
+     {
+-        xine_gui_send_vo_data(xine_stream_, XINE_GUI_SEND_DRAWABLE_CHANGED, (void*)this);
+-        xine_gui_send_vo_data(xine_stream_, XINE_GUI_SEND_VIDEOWIN_VISIBLE, (void*)1);
++        xine_port_send_gui_data(xine_vo_port_, XINE_GUI_SEND_DRAWABLE_CHANGED, (void*)this);
++        xine_port_send_gui_data(xine_vo_port_, XINE_GUI_SEND_VIDEOWIN_VISIBLE, (void*)1);
+     }
+ 
+     void xine_panel::open(const std::string& stream_mrl)
+@@ -276,10 +275,9 @@
+         }
+         redraw(rect());
+ 
+-        // FIXME: these are deprecated, use: xine_port_send_gui_data(...)
+-        xine_gui_send_vo_data(xine_stream_, XINE_GUI_SEND_DRAWABLE_CHANGED, (void*)this);
+-        xine_gui_send_vo_data(xine_stream_, XINE_GUI_SEND_VIDEOWIN_VISIBLE, (void*)1);
+-        xine_gui_send_vo_data(xine_stream_, XINE_GUI_SEND_EXPOSE_EVENT, NULL);
++        xine_port_send_gui_data(xine_vo_port_, XINE_GUI_SEND_DRAWABLE_CHANGED, (void*)this);
++        xine_port_send_gui_data(xine_vo_port_, XINE_GUI_SEND_VIDEOWIN_VISIBLE, (void*)1);
++        xine_port_send_gui_data(xine_vo_port_, XINE_GUI_SEND_EXPOSE_EVENT, NULL);
+     }
+ 
+     void xine_panel::play(int position, int millis)
+@@ -386,9 +384,8 @@
+ 
+         INFO("sending gui drawable changed");
+         // FIXME: this is now done on_resize()... is that the best way?, maybe we should just have a minimize function?
+-        // FIXME: these are deprecated, use: xine_port_send_gui_data(...)
+-        //xine_gui_send_vo_data(xine_stream_, XINE_GUI_SEND_DRAWABLE_CHANGED, (void*)this);
+-        //xine_gui_send_vo_data(xine_stream_, XINE_GUI_SEND_VIDEOWIN_VISIBLE, (void*)1);
++        //xine_port_send_gui_data(xine_vo_port_, XINE_GUI_SEND_DRAWABLE_CHANGED, (void*)this);
++        //xine_port_send_gui_data(xine_vo_port_, XINE_GUI_SEND_VIDEOWIN_VISIBLE, (void*)1);
+     }
+ 
+     bool xine_panel::visualization(const std::string& name)

================================================================
Index: packages/libstk/libstk-xsl.patch
diff -u /dev/null packages/libstk/libstk-xsl.patch:1.1
--- /dev/null	Sat Feb 25 19:55:17 2012
+++ packages/libstk/libstk-xsl.patch	Sat Feb 25 19:55:11 2012
@@ -0,0 +1,9 @@
+--- dvhart-libstk-6186fff/doc/htmlchunkedsheet.xsl.orig	2007-07-19 10:46:21.000000000 +0200
++++ dvhart-libstk-6186fff/doc/htmlchunkedsheet.xsl	2012-02-25 19:22:54.742674861 +0100
+@@ -1,5 +1,5 @@
+ <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                 version='1.0'>
+ 
+-  <xsl:import href="/usr/share/sgml/docbook/stylesheet/xsl/nwalsh/html/chunk.xsl" />
++  <xsl:import href="/usr/share/sgml/docbook/xsl-stylesheets/html/chunk.xsl" />
+ </xsl:stylesheet>
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/libstk/libstk-fixes.patch?r1=1.8&r2=1.9&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/libstk/libstk.spec?r1=1.72&r2=1.73&f=u

More information about the pld-cvs-commit mailing list