packages: spice-space/spice-gl.patch (NEW), spice-space/spice-link.patch (N...
qboosh
qboosh at pld-linux.org
Mon Jul 18 17:51:01 CEST 2011
Author: qboosh Date: Mon Jul 18 15:51:01 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- initial; use web name as spec name becase pure package name is already occupied in spec namespace
- sh patch to fix configure with sh not being bash
- link patch to fix libspice-server linking
- gl patch to fix build with OpenGL
---- Files affected:
packages/spice-space:
spice-gl.patch (NONE -> 1.1) (NEW), spice-link.patch (NONE -> 1.1) (NEW), spice-sh.patch (NONE -> 1.1) (NEW), spice-space.spec (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: packages/spice-space/spice-gl.patch
diff -u /dev/null packages/spice-space/spice-gl.patch:1.1
--- /dev/null Mon Jul 18 17:51:01 2011
+++ packages/spice-space/spice-gl.patch Mon Jul 18 17:50:56 2011
@@ -0,0 +1,23 @@
+--- spice-0.8.1/client/x11/red_window.cpp.orig 2010-12-16 16:23:56.000000000 +0100
++++ spice-0.8.1/client/x11/red_window.cpp 2011-07-17 21:26:16.466759495 +0200
+@@ -2075,7 +2075,7 @@
+ #ifdef USE_OGL
+ RedGlContext RedWindow::create_context_gl()
+ {
+- RedGlContext *context = NULL;
++ RedGlContext context = NULL;
+ if (XPlatform::get_fbconfig()[_screen]) {
+ XLockDisplay(x_display);
+ context = glXCreateContext(x_display, XPlatform::get_vinfo()[_screen], NULL, GL_TRUE);
+--- spice-0.8.1/client/display_channel.cpp.orig 2011-02-10 20:04:20.000000000 +0100
++++ spice-0.8.1/client/display_channel.cpp 2011-07-18 04:22:57.727596629 +0200
+@@ -1437,9 +1437,6 @@
+
+ void DisplayChannel::create_surface(int surface_id, int width, int height, uint32_t format)
+ {
+-#ifdef USE_OGL
+- Canvas *canvas;
+-#endif
+ AutoRef<CreateSurfaceEvent> event(new CreateSurfaceEvent(*this, surface_id, width, height,
+ format));
+ get_client().push_event(*event);
================================================================
Index: packages/spice-space/spice-link.patch
diff -u /dev/null packages/spice-space/spice-link.patch:1.1
--- /dev/null Mon Jul 18 17:51:01 2011
+++ packages/spice-space/spice-link.patch Mon Jul 18 17:50:56 2011
@@ -0,0 +1,20 @@
+--- spice-0.8.1/server/Makefile.am.orig 2011-03-24 15:25:19.000000000 +0100
++++ spice-0.8.1/server/Makefile.am 2011-07-16 20:32:00.693757490 +0200
+@@ -71,6 +71,7 @@
+ $(SLIRP_LIBS) \
+ $(LIBRT) \
+ $(Z_LIBS) \
++ -lpthread \
+ $(NULL)
+
+ if SUPPORT_TUNNEL
+--- spice-0.8.1/configure.ac.orig 2011-07-16 21:32:29.380545659 +0200
++++ spice-0.8.1/configure.ac 2011-07-17 05:07:41.354793498 +0200
+@@ -224,6 +224,7 @@
+ if test "x$have_opengl" = "xyes"; then
+ AC_CHECK_LIB(GL, glBlendFunc, GL_LIBS="$GL_LIBS -lGL", have_opengl=no)
+ AC_CHECK_LIB(GLU, gluSphere, GL_LIBS="$GL_LIBS -lGLU", have_opengl=no)
++ AC_CHECK_LIB(X11, XOpenDisplay, GL_LIBS="$GL_LIBS -lX11", have_opengl=no)
+ GL_CFLAGS="-DGL_GLEXT_PROTOTYPES -DUSE_OGL"
+
+ if test "x$have_opengl" = "xno"; then
================================================================
Index: packages/spice-space/spice-sh.patch
diff -u /dev/null packages/spice-space/spice-sh.patch:1.1
--- /dev/null Mon Jul 18 17:51:01 2011
+++ packages/spice-space/spice-sh.patch Mon Jul 18 17:50:56 2011
@@ -0,0 +1,87 @@
+--- spice-0.8.1/configure.ac.orig 2011-04-20 10:48:33.000000000 +0200
++++ spice-0.8.1/configure.ac 2011-07-16 12:18:43.082766454 +0200
+@@ -138,7 +138,7 @@
+ )
+ AC_SUBST(LIBRT)
+
+-SPICE_NONPKGCONFIG_LIBS+=" -pthread $LIBM $LIBRT"
++SPICE_NONPKGCONFIG_LIBS="$SPICE_NONPKGCONFIG_LIBS -pthread $LIBM $LIBRT"
+
+ dnl The client needs a yield function
+ AC_MSG_CHECKING(for posix yield function)
+@@ -150,7 +150,7 @@
+ [$yield_func()],
+ [posix_yield_func="$yield_func"
+ break])
+- CPPFLAGS="spice_save_CPPFLAGS"
++ CPPFLAGS="$spice_save_CPPFLAGS"
+ done
+ if test x"$posix_yield_func" = xnone; then
+ AC_MSG_ERROR([No posix yield function found])
+@@ -167,13 +167,13 @@
+ [
+ AC_SUBST(CEGUI06_CFLAGS)
+ AC_SUBST(CEGUI06_LIBS)
+- CEGUI06_CFLAGS+="-DUSE_GUI"
++ CEGUI06_CFLAGS="$CEGUI06_CFLAGS -DUSE_GUI"
+ ],
+ [
+ PKG_CHECK_MODULES(CEGUI, CEGUI >= 0.6.0 CEGUI < 0.7.0)
+ AC_SUBST(CEGUI_CFLAGS)
+ AC_SUBST(CEGUI_LIBS)
+- CEGUI_CFLAGS+="-DUSE_GUI"
++ CEGUI_CFLAGS="$CEGUI_CFLAGS -DUSE_GUI"
+ ])
+ fi
+
+@@ -181,7 +181,7 @@
+ PKG_CHECK_MODULES(SLIRP, slirp)
+ AC_SUBST(SLIRP_CFLAGS)
+ AC_SUBST(SLIRP_LIBS)
+- SPICE_REQUIRES+=" slirp"
++ SPICE_REQUIRES="$SPICE_REQUIRES slirp"
+ AC_DEFINE([HAVE_SLIRP], [], [Define if we have slirp])
+ fi
+
+@@ -197,13 +197,13 @@
+ PKG_CHECK_MODULES(PIXMAN, pixman-1 >= 0.17.7)
+ AC_SUBST(PIXMAN_CFLAGS)
+ AC_SUBST(PIXMAN_LIBS)
+-SPICE_REQUIRES+=" pixman-1 >= 0.17.7"
++SPICE_REQUIRES="$SPICE_REQUIRES pixman-1 >= 0.17.7"
+
+ PKG_CHECK_MODULES(CELT051, celt051 >= 0.5.1.1)
+ AC_SUBST(CELT051_CFLAGS)
+ AC_SUBST(CELT051_LIBS)
+ AC_SUBST(CELT051_LIBDIR)
+-SPICE_REQUIRES+=" celt051 >= 0.5.1.1"
++SPICE_REQUIRES="$SPICE_REQUIRES celt051 >= 0.5.1.1"
+
+ PKG_CHECK_MODULES(ALSA, alsa)
+ AC_SUBST(ALSA_CFLAGS)
+@@ -212,14 +212,14 @@
+ PKG_CHECK_MODULES(SSL, openssl)
+ AC_SUBST(SSL_CFLAGS)
+ AC_SUBST(SSL_LIBS)
+-SPICE_REQUIRES+=" openssl"
++SPICE_REQUIRES="$SPICE_REQUIRES openssl"
+
+ # These are commented out because the gl libraries on RHEL 5 do not have pkgconfig files
+ #
+ # PKG_CHECK_MODULES(GL, gl glu)
+ # AC_SUBST(GL_CFLAGS)
+ # AC_SUBST(GL_LIBS)
+-# SPICE_REQUIRES+=" gl glu"
++# SPICE_REQUIRES="$SPICE_REQUIRES gl glu"
+
+ if test "x$have_opengl" = "xyes"; then
+ AC_CHECK_LIB(GL, glBlendFunc, GL_LIBS="$GL_LIBS -lGL", have_opengl=no)
+@@ -233,7 +233,7 @@
+
+ AC_SUBST(GL_CFLAGS)
+ AC_SUBST(GL_LIBS)
+-SPICE_NONPKGCONFIG_LIBS+=" $GL_LIBS"
++SPICE_NONPKGCONFIG_LIBS="$SPICE_NONPKGCONFIG_LIBS $GL_LIBS"
+
+ PKG_CHECK_MODULES(XRANDR, xrandr)
+ PKG_CHECK_MODULES(XFIXES, xfixes)
================================================================
Index: packages/spice-space/spice-space.spec
diff -u /dev/null packages/spice-space/spice-space.spec:1.1
--- /dev/null Mon Jul 18 17:51:01 2011
+++ packages/spice-space/spice-space.spec Mon Jul 18 17:50:56 2011
@@ -0,0 +1,173 @@
+# $Revision$, $Date$
+Summary: SPICE virtualization solution
+Summary(pl.UTF-8): System wirtualizacji SPICE
+# real package name (spice) is already occupied
+Name: spice-space
+Version: 0.8.1
+Release: 0.1
+License: LGPL v2.1+
+Group: Applications/Emulators
+Source0: http://spice-space.org/download/releases/spice-%{version}.tar.bz2
+# Source0-md5: df682a42f4bc03fa5e35d2844a0e4b4b
+Patch0: spice-sh.patch
+Patch1: spice-link.patch
+Patch2: spice-gl.patch
+URL: http://spice-space.org/
+BuildRequires: OpenGL-GLU-devel
+BuildRequires: alsa-lib-devel
+BuildRequires: celt051-devel >= 0.5.1.1
+BuildRequires: autoconf >= 2.57
+BuildRequires: automake
+BuildRequires: libcacard-devel >= 0.1.2
+BuildRequires: libjpeg-devel
+BuildRequires: libstdc++-devel
+BuildRequires: libtool
+BuildRequires: openssl-devel
+BuildRequires: pixman-devel >= 0.17.7
+BuildRequires: pkgconfig
+BuildRequires: spice-protocol >= 0.7.0
+BuildRequires: xorg-lib-libXext-devel
+BuildRequires: xorg-lib-libXfixes-devel
+BuildRequires: xorg-lib-libXrandr-devel >= 1.2
+BuildRequires: xorg-lib-libXrender-devel
+BuildRequires: zlib-devel
+ExclusiveArch: %{ix86} %{x8664} arm
+BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+
+%description
+Spice is an open remote computing solution, providing client access to
+remote machine display and devices (e.g., keyboard, mouse, audio).
+Spice achieves a user experience similar to an interaction with a
+local machine, while trying to offload most of the intensive CPU and
+GPU tasks to the client. Spice is suitable for both LAN and WAN usage,
+without compromising on the user experience.
+
+%description -l pl.UTF-8
+Spice to rozwiązanie do zdalnych obliczeń, zapewniające dostęp
+kliencki ekranu i urządzeń zdalnej maszyny (klawiatury, myszy,
+dźwięku). Daje użytkownikowi wrażenie podobne do pracy lokalnej, ale
+próbuje większość zadań wykorzystujących intensywnie CPU i GPU zrzucić
+na klienta. Nadaje się do pracy w sieciach LAN i WAN, bez większych
+poświęceń ze strony doznań użytkownika.
+
+%package -n spice-server-libs
+Summary: SPICE server library
+Summary(pl.UTF-8): Biblioteka serwera SPICE
+Group: Libraries
+Requires: celt051 >= 0.5.1.1
+Requires: pixman >= 0.17.7
+
+%description -n spice-server-libs
+SPICE server library.
+
+%description -n spice-server-libs -l pl.UTF-8
+Biblioteka serwera SPICE.
+
+%package -n spice-server-devel
+Summary: Header files for SPICE server library
+Summary(pl.UTF-8): Pliki nagłówkowe biblioteki serwera SPICE
+Group: Development/Libraries
+Requires: celt051-devel >= 0.5.1.1
+Requires: openssl-devel
+Requires: pixman-devel >= 0.17.7
+Requires: spice-server-libs = %{version}-%{release}
+
+%description -n spice-server-devel
+Header files for SPICE server library.
+
+%description -n spice-server-devel -l pl.UTF-8
+Pliki nagłówkowe biblioteki serwera SPICE.
+
+%package -n spice-server-static
+Summary: Static SPICE server library
+Summary(pl.UTF-8): Statyczna biblioteka serwera SPICE
+Group: Development/Libraries
+Requires: spice-server-devel = %{version}-%{release}
+
+%description -n spice-server-static
+Static SPICE server library.
+
+%description -n spice-server-static -l pl.UTF-8
+Statyczna biblioteka serwera SPICE.
+
+%package -n spice-client
+Summary: SPICE client for X11
+Summary(pl.UTF-8): Klient SPICE dla X11
+Group: X11/Applications
+Requires: celt051 >= 0.5.1.1
+Requires: libcacard >= 0.1.2
+Requires: pixman >= 0.17.7
+Requires: xorg-lib-libXrandr >= 1.2
+
+%description -n spice-client
+SPICE client for X11.
+
+%description -n spice-client -l pl.UTF-8
+Klient SPICE dla X11.
+
+%prep
+%setup -q -n spice-%{version}
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+
+%build
+%{__libtoolize}
+%{__aclocal}
+%{__autoconf}
+%{__autoheader}
+%{__automake}
+%configure \
+ --enable-opengl \
+ --enable-smartcard
+# --enable-gui BR: CEGUI-devel >= 0.6.0 < 0.7.0
+# --enable-tunnel BR: libslirp-devel
+
+%{__make}
+
+%install
+rm -rf $RPM_BUILD_ROOT
+
+%{__make} install \
+ DESTDIR=$RPM_BUILD_ROOT
+
+# obsoleted by pkg-config
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/libspice-server.la
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%post -n spice-server-libs -p /sbin/ldconfig
+%postun -n spice-server-libs -p /sbin/ldconfig
+
+%files -n spice-server-libs
+%defattr(644,root,root,755)
+%doc NEWS README
+%attr(755,root,root) %{_libdir}/libspice-server.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libspice-server.so.1
+
+%files -n spice-server-devel
+%defattr(644,root,root,755)
+%{_includedir}/spice-server
+%attr(755,root,root) %{_libdir}/libspice-server.so
+%{_pkgconfigdir}/spice-server.pc
+
+%files -n spice-server-static
+%defattr(644,root,root,755)
+%{_libdir}/libspice-server.a
+
+%files -n spice-client
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/spicec
+
+%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
+%changelog
+* %{date} PLD Team <feedback at pld-linux.org>
+All persons listed below can be reached at <cvs_login>@pld-linux.org
+
+$Log$
+Revision 1.1 2011/07/18 15:50:56 qboosh
+- initial; use web name as spec name becase pure package name is already occupied in spec namespace
+- sh patch to fix configure with sh not being bash
+- link patch to fix libspice-server linking
+- gl patch to fix build with OpenGL
================================================================
More information about the pld-cvs-commit
mailing list