Author: evil Date: Sat Feb 19 23:16:08 2011 GMT
Module: packages Tag: DEVEL
---- Log message:
- added CAPI 2.0 (ISDN) support
- removed deprecated TODOs
---- Files affected:
packages/wine:
wine.spec (1.391.2.21 -> 1.391.2.22)
---- Diffs:
================================================================
Index: packages/wine/wine.spec
diff -u packages/wine/wine.spec:1.391.2.21 packages/wine/wine.spec:1.391.2.22
--- packages/wine/wine.spec:1.391.2.21 Sat Feb 19 23:04:02 2011
+++ packages/wine/wine.spec Sun Feb 20 00:16:03 2011
@@ -1,21 +1,15 @@
# $Revision$, $Date$
#
-# TODO: solve this:
-# pen.c: In function 'X11DRV_SelectPen':
-# pen.c:31:12: internal compiler error: Segmentation fault
-#
# Conditional build:
%bcond_without alsa # don't build ALSA mm driver
%bcond_with esd # build ESD mm driver
+%bcond_without capi # don't build CAPI 2.0 (ISDN) support
%bcond_without gstramer # don't build GStreamer filters support
%bcond_without jack # don't build JACK mm driver
%bcond_without nas # don't build NAS mm driver
%bcond_without sane # don't build TWAIN DLL with scanning support
(through SANE)
%bcond_without cups # without CUPS printing support in
winspool,wineps DLLs
#
-# TODO:
-# - support for CAPI (ISDN support; --with-capi)
-#
# NOTE: wine detects the following SONAMES for dlopen at build time:
# libcrypto,libssl (wininet.dll)
# libcups (winspool.dll.so,wineps.dll.so)
@@ -63,6 +57,7 @@
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: bison
+%{?with_capi:BuildRequires: capi4k-utils-devel}
%{?with_cups:BuildRequires: cups-devel}
BuildRequires: docbook-dtd31-sgml
BuildRequires: docbook-utils
@@ -193,6 +188,18 @@
%description programs -l pl.UTF-8
Wine - programy.
+%package dll-capi
+Summary: CAPI 2.0 (ISDN) implementation DLLs for Wine
+Summary(pl.UTF-8): Biblioteki DLL z implementacją CAPI 2.0 (ISDN) dla Wine
+Group: Applications/Emulators
+Requires: %{name} = %{epoch}:%{version}-%{release}
+
+%description dll-capi
+CAPI 2.0 (ISDN) implementation DLLs for Wine (through OpenGL).
+
+%description dll-capi -l pl.UTF-8
+Biblioteki DLL z implementacją CAPI 2.0 (ISDN) dla Wine (poprzez OpenGL).
+
%package dll-d3d
Summary: Direct3D implementation DLLs for Wine
Summary(pl.UTF-8): Biblioteki DLL z implementacją Direct3D dla Wine
@@ -294,7 +301,7 @@
%endif
--with%{!?with_alsa:out}-alsa \
--with-audioio \
- --without-capi \
+ --with%{!?with_capi:out}-capi \
--with-cms \
--with-coreaudio \
--with%{!?with_cups:out}-cups \
@@ -531,6 +538,10 @@
%{_mandir}/man1/wrc.1*
%{_aclocaldir}/*.m4
+%files dll-capi
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/wine/capi2032.dll.so
+
%files dll-d3d
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/wine/d3d8.dll.so
@@ -578,6 +589,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.391.2.22 2011/02/19 23:16:03 evil
+- added CAPI 2.0 (ISDN) support
+- removed deprecated TODOs
+
Revision 1.391.2.21 2011/02/19 22:04:02 evil
- up to 1.3.14
- added x8664 as second ExclusiveArch, and added rules allowing building
wine64(Win64/PE64 compatible)
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/wine/wine.spec?r1=1.391.2.21&r2=1.391.2.22&f=u
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
