Author: qboosh Date: Sun Nov 13 08:26:04 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- updated to 0.10.0
- updated sh,link patches
---- Files affected:
packages/spice-space:
spice-link.patch (1.2 -> 1.3) , spice-sh.patch (1.1 -> 1.2) ,
spice-space.spec (1.4 -> 1.5)
---- Diffs:
================================================================
Index: packages/spice-space/spice-link.patch
diff -u packages/spice-space/spice-link.patch:1.2
packages/spice-space/spice-link.patch:1.3
--- packages/spice-space/spice-link.patch:1.2 Mon Jul 25 21:13:50 2011
+++ packages/spice-space/spice-link.patch Sun Nov 13 09:25:58 2011
@@ -1,20 +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 \
+--- spice-0.10.0/server/Makefile.am.orig 2011-11-10 16:02:06.000000000
+0100
++++ spice-0.10.0/server/Makefile.am 2011-11-13 08:37:58.767174939 +0100
+@@ -48,6 +48,7 @@
+ $(SASL_LIBS) \
+ $(SLIRP_LIBS) \
+ $(SSL_LIBS) \
++ -lpthread \
$(NULL)
- if SUPPORT_TUNNEL
---- spice-0.8.2/configure.ac.orig 2011-07-25 20:55:56.000000000 +0200
-+++ spice-0.8.2/configure.ac 2011-07-25 20:57:18.293178544 +0200
-@@ -237,6 +237,7 @@
+ libspice_server_la_SOURCES = \
+--- spice-0.10.0/configure.ac.orig 2011-11-13 08:37:42.000000000 +0100
++++ spice-0.10.0/configure.ac 2011-11-13 08:38:30.260509328 +0100
+@@ -246,6 +246,7 @@
if test "x$enable_opengl" = "xyes"; then
AC_CHECK_LIB(GL, glBlendFunc, GL_LIBS="$GL_LIBS -lGL", enable_opengl=no)
AC_CHECK_LIB(GLU, gluSphere, GL_LIBS="$GL_LIBS -lGLU", enable_opengl=no)
+ AC_CHECK_LIB(X11, XOpenDisplay, GL_LIBS="$GL_LIBS -lX11", have_opengl=no)
- GL_CFLAGS="-DGL_GLEXT_PROTOTYPES -DUSE_OGL"
+ AC_DEFINE([USE_OPENGL], [1], [Define to build with OpenGL support])
+ AC_DEFINE([GL_GLEXT_PROTOTYPES], [], [Enable GLExt prototypes])
- if test "x$enable_opengl" = "xno"; then
================================================================
Index: packages/spice-space/spice-sh.patch
diff -u packages/spice-space/spice-sh.patch:1.1
packages/spice-space/spice-sh.patch:1.2
--- packages/spice-space/spice-sh.patch:1.1 Mon Jul 18 17:50:56 2011
+++ packages/spice-space/spice-sh.patch Sun Nov 13 09:25:58 2011
@@ -1,40 +1,18 @@
---- 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 @@
- )
+--- spice-0.10.0/configure.ac.orig 2011-11-10 16:02:06.000000000 +0100
++++ spice-0.10.0/configure.ac 2011-11-13 08:00:42.323766723 +0100
+@@ -145,9 +145,9 @@
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"
- ])
+ if test "$red_target" = "windows"; then
+- SPICE_NONPKGCONFIG_LIBS+=" -lpthreadGC2 -lversion -lmsimg32 $LIBM"
++ SPICE_NONPKGCONFIG_LIBS="$SPICE_NONPKGCONFIG_LIBS -lpthreadGC2
-lversion -lmsimg32 $LIBM"
+ else
+- SPICE_NONPKGCONFIG_LIBS+=" -pthread $LIBM $LIBRT"
++ SPICE_NONPKGCONFIG_LIBS="$SPICE_NONPKGCONFIG_LIBS -pthread $LIBM $LIBRT"
fi
-@@ -181,7 +181,7 @@
+ dnl The client needs a yield function
+@@ -191,7 +191,7 @@
PKG_CHECK_MODULES(SLIRP, slirp)
AC_SUBST(SLIRP_CFLAGS)
AC_SUBST(SLIRP_LIBS)
@@ -43,7 +21,7 @@
AC_DEFINE([HAVE_SLIRP], [], [Define if we have slirp])
fi
-@@ -197,13 +197,13 @@
+@@ -207,13 +207,13 @@
PKG_CHECK_MODULES(PIXMAN, pixman-1 >= 0.17.7)
AC_SUBST(PIXMAN_CFLAGS)
AC_SUBST(PIXMAN_LIBS)
@@ -57,9 +35,9 @@
-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 @@
+ if test ! -e client/generated_marshallers.cpp; then
+ AC_MSG_CHECKING([for pyparsing python module])
+@@ -234,14 +234,14 @@
PKG_CHECK_MODULES(SSL, openssl)
AC_SUBST(SSL_CFLAGS)
AC_SUBST(SSL_LIBS)
@@ -74,14 +52,14 @@
-# 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 @@
+ if test "x$enable_opengl" = "xyes"; then
+ AC_CHECK_LIB(GL, glBlendFunc, GL_LIBS="$GL_LIBS -lGL", enable_opengl=no)
+@@ -256,7 +256,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)
+ if test "$red_target" = "x11"; then
+ PKG_CHECK_MODULES(XRANDR, xrandr)
================================================================
Index: packages/spice-space/spice-space.spec
diff -u packages/spice-space/spice-space.spec:1.4
packages/spice-space/spice-space.spec:1.5
--- packages/spice-space/spice-space.spec:1.4 Sat Oct 8 19:58:34 2011
+++ packages/spice-space/spice-space.spec Sun Nov 13 09:25:58 2011
@@ -3,12 +3,12 @@
Summary(pl.UTF-8): System wirtualizacji SPICE
# real package name (spice) is already occupied
Name: spice-space
-Version: 0.8.2
+Version: 0.10.0
Release: 1
License: LGPL v2.1+
Group: Applications/Emulators
Source0:
http://spice-space.org/download/releases/spice-%{version}.tar.bz2
-# Source0-md5: 80aa1b165b2c2ed5608012986ade3c01
+# Source0-md5: d9f0b0280c9e2291623c9560e156be26
Patch0: spice-sh.patch
Patch1: spice-link.patch
URL: http://spice-space.org/
@@ -17,6 +17,7 @@
BuildRequires: celt051-devel >= 0.5.1.1
BuildRequires: autoconf >= 2.57
BuildRequires: automake
+BuildRequires: cyrus-sasl-devel >= 2
BuildRequires: libcacard-devel >= 0.1.2
BuildRequires: libjpeg-devel
BuildRequires: libslirp-devel
@@ -25,7 +26,7 @@
BuildRequires: openssl-devel
BuildRequires: pixman-devel >= 0.17.7
BuildRequires: pkgconfig
-BuildRequires: spice-protocol >= 0.8.1
+BuildRequires: spice-protocol >= 0.9.1
BuildRequires: xorg-lib-libXext-devel
BuildRequires: xorg-lib-libXfixes-devel
BuildRequires: xorg-lib-libXrandr-devel >= 1.2
@@ -166,6 +167,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.5 2011/11/13 08:25:58 qboosh
+- updated to 0.10.0
+- updated sh,link patches
+
Revision 1.4 2011/10/08 17:58:34 wiget
- rel. 1
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/spice-space/spice-link.patch?r1=1.2&r2=1.3&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/spice-space/spice-sh.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/spice-space/spice-space.spec?r1=1.4&r2=1.5&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
