Bug#739269: Please move libwayland-egl out of libegl1-mesa-drivers

2014-03-03 Thread Sjoerd Simons
On Sun, 2014-03-02 at 20:34 +0100, Julien Cristau wrote:
> On Sun, Mar  2, 2014 at 19:09:50 +0100, Julien Cristau wrote:
> 
> > On Mon, Feb 17, 2014 at 14:50:48 +0100, Sjoerd Simons wrote:
> > 
> > > diff --git a/debian/control b/debian/control
> > > index 4577639..de02e96 100644
> > > --- a/debian/control
> > > +++ b/debian/control
> > > @@ -308,6 +308,7 @@ Depends:
> > >   ${misc:Depends},
> > >   libegl1-mesa (= ${binary:Version}),
> > >   libglapi-mesa (= ${binary:Version}),
> > > + libwayland-egl1-mesa (= ${binary:Version}),
> > >  # for libllvmradeon
> > >   libgl1-mesa-dri (= ${binary:Version}) [any-i386 any-amd64],
> > >  Pre-Depends: ${misc:Pre-Depends}
> > > @@ -320,6 +321,41 @@ Description: free implementation of the EGL API -- 
> > > hardware drivers
> > >   This package contains the drivers required for hardware accelerated 
> > > rendering
> > >   of EGL-based graphics libraries, such as OpenGL|ES and OpenVG.
> > >  
> > > +Package: libwayland-egl1-mesa
> > > +Section: libs
> > > +Architecture: linux-any
> > > +Depends:
> > > + ${shlibs:Depends},
> > > + ${misc:Depends},
> > > + libegl1-mesa (= ${binary:Version})
> > > +Recommends: libegl1-mesa-drivers
> > > +Provides: libwayland-egl
> > > +Conflicts: libwayland-egl1
> > > +Replaces: libwayland-egl1
> > 
> > This looks broken.  If this new package contains files split out of
> > libegl1-mesa-drivers then it needs to replace its old versions, at the
> > very least.  Can somebody please fix this (and test the upgrade path)?
> > 
> > > +Pre-Depends: ${misc:Pre-Depends}
> > > +Multi-Arch: same
> > > +Description: free implementation of the EGL API -- runtime
> > > + This package contains the EGL native platform graphics interface 
> > > library.
> > > + EGL provides a platform-agnostic mechanism for creating rendering 
> > > surfaces
> > > + for use with other graphics libraries, such as OpenGL|ES and OpenVG.
> > > + .
> > > + This package contains wayland specific interface for use with EGL.
> > > +
> 
> Also the short description is the one from libegl, which is not
> appropriate here.
> 
> And I'm thinking splitting out a -dev package might be useful if this
> lib is supposed to be used externally.  If not, we shouldn't ship a .pc
> file and a .so symlink.

It's meant to be used externally indeed. Any Wayland application that
uses EGL/GLES2 should use it to e.g. transform a wayland surface into an
EGLNativeWindow for use with the EGL stack.

I did keep the .so/.pc etc in libegl1-mesa-dev (as they are currently)
as libwayland-egl is both conceptually part of the EGL stack and tiny
(the .h is not even 60 lines). I'm happy to update the patch to split it
out into its own package as well though (as well as correct the other
issues you've noted)


-- 
Sjoerd Simons 


--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/1393836590.12561.7.ca...@dusk.luon.net



Changes to 'debian-experimental': revert gallium 3D vdpau support

2014-03-03 Thread Eric Valette

  
  
Hi,

When I see this, and the remove "enable glamor by default" for
ati/radeon X11 driver, I wonder if you are on a personnal crusade
against ATI/AMD . Do you want to discourage people of byuing AMD
hardware? The progress of using hardware decoding via UVD using OSS
software has been spectacular in the last moths and I've been using
it on various APU (A350/A450/A5000).

These new and old APU are beeing used in many HTPC and  low cost
laptop comme equiped with A5000 kabini chipsets and doing this kind
of revert you will prevent anyone using them on debian without
requiring catalyst drivers. Or is your goal to avoid support of
gallium 3D by forcinf fglrx and then saying ask AMD to fix their
bugs?

-- eric
  



-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/53144a11.7070...@free.fr



mesa: Changes to 'debian-experimental'

2014-03-03 Thread Andreas Boll
 debian/changelog |6 ++
 debian/rules |4 
 2 files changed, 10 insertions(+)

New commits:
commit a51d81511fd0b24a85645a6440bea08cc9b34fcc
Author: Andreas Boll 
Date:   Mon Mar 3 12:35:35 2014 +0100

Disable dri3 on !linux

diff --git a/debian/changelog b/debian/changelog
index a67725d..3e22624 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mesa (10.1.0~rc2-2) UNRELEASED; urgency=medium
+
+  * Disable dri3 on !linux
+
+ -- Andreas Boll   Mon, 03 Mar 2014 12:39:45 +0100
+
 mesa (10.1.0~rc2-1) experimental; urgency=medium
 
   [ Maarten Lankhorst ]
diff --git a/debian/rules b/debian/rules
index e6207ba..b148e5f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -53,12 +53,15 @@ DRI_DRIVERS =
 GALLIUM_DRIVERS =
 EGL_DISPLAYS = x11
 
+confflags_DRI3 = --disable-dri3
+
 # hurd doesn't do direct rendering
 ifeq ($(DEB_HOST_ARCH_OS), hurd)
confflags_DIRECT_RENDERING = --disable-driglx-direct
DRI_DRIVERS += swrast
 else
   ifeq ($(DEB_HOST_ARCH_OS), linux)
+   confflags_DRI3 = --enable-dri3
 # Gallium drivers require libdrm-{nouveau,radeon}, only available on Linux
GALLIUM_DRIVERS += nouveau svga
 #
@@ -119,6 +122,7 @@ confflags-dri = \
--enable-xa \
--disable-xvmc --disable-vdpau \
$(confflags_DIRECT_RENDERING) \
+   $(confflags_DRI3) \
$(confflags_EGL) \
$(confflags_GALLIUM) \
$(confflags_GLES) \


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/e1wkrff-0007ml...@moszumanska.debian.org



mesa: Changes to 'ubuntu'

2014-03-03 Thread Maarten Lankhorst
 VERSION|2 
 debian/changelog   |   43 -
 debian/control |   75 
++
 debian/libegl1-mesa-drivers.install.linux.in   |6 
 debian/libgbm1.install.in  |2 
 debian/libgbm1.symbols |   15 --
 debian/libgl1-mesa-dri.install.hurd.in |2 
 debian/libgl1-mesa-dri.install.in  |4 
 debian/libopenvg1-mesa-dev.install.in  |6 
 debian/libopenvg1-mesa.install.in  |2 
 debian/patches/03_gbm_make_devices_static.diff |   27 +++
 debian/patches/05_fix-defaults-glxfbconfig.patch   |   55 +++
 debian/patches/06_fix-sort-glxfbconfig.patch   |   58 +++
 debian/patches/07_gallium-fix-build-failure-on-powerpcspe.diff |   40 +
 debian/patches/fix-defaults-glxfbconfig.patch  |   55 ---
 debian/patches/fix-sort-glxfbconfig.patch  |   58 ---
 debian/patches/series  |6 
 debian/rules   |   52 ++
 src/gallium/drivers/r600/r600_hw_context.c |2 
 src/gallium/drivers/r600/r600_pipe.c   |8 -
 src/gallium/drivers/r600/r600_pipe.h   |1 
 src/gallium/drivers/radeon/r600_buffer_common.c|2 
 src/gallium/drivers/radeon/r600_pipe_common.c  |2 
 src/gallium/drivers/radeon/r600_pipe_common.h  |3 
 src/gallium/drivers/radeon/r600_texture.c  |2 
 src/gallium/drivers/radeonsi/si_hw_context.c   |4 
 src/gallium/targets/r600/vdpau/Makefile.am |6 
 src/glsl/ast_to_hir.cpp|   13 +
 src/glsl/builtin_functions.cpp |   11 +
 src/glsl/glcpp/glcpp-parse.y   |   22 ++
 src/glsl/glcpp/tests/086-reserved-macro-names.c.expected   |4 
 src/glsl/linker.cpp|9 -
 src/glsl/opt_vectorize.cpp |   14 +
 src/mesa/drivers/dri/i965/brw_context.c|   12 -
 src/mesa/drivers/dri/nouveau/nouveau_context.c |7 
 src/mesa/drivers/dri/nouveau/nouveau_context.h |3 
 src/mesa/drivers/dri/nouveau/nouveau_driver.h  |1 
 src/mesa/drivers/dri/nouveau/nv04_context.c|5 
 src/mesa/drivers/dri/nouveau/nv10_context.c|   13 -
 src/mesa/drivers/dri/nouveau/nv10_state_fb.c   |4 
 src/mesa/drivers/dri/nouveau/nv10_state_raster.c   |3 
 src/mesa/drivers/dri/nouveau/nv20_context.c|5 
 src/mesa/main/attrib.c |1 
 src/mesa/main/shaderobj.c  |1 
 src/mesa/main/texparam.c   |3 
 45 files changed, 409 insertions(+), 260 deletions(-)

New commits:
commit 0f9ca5a14ec4b4d0709d72d729f12f361ea8b9fc
Author: Maarten Lankhorst 
Date:   Mon Mar 3 12:12:45 2014 +0100

Enable egl, libopenvg, gbm and vdpau for all archs.

This simplifies the build rules considerably,
and is closer to debian behavior.

diff --git a/debian/changelog b/debian/changelog
index c0cf069..99e5133 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,10 @@
-mesa (10.1.0~rc2-0ubuntu1) trusty; urgency=medium
+mesa (10.1.0~rc2-1ubuntu1) UNRELEASED; urgency=medium
 
   [ Maarten Lankhorst ]
-  * Merge from unreleased debian-experimental.
+  * Merge from released debian-experimental.
+  * Enable egl, libopenvg, gbm and vdpau for all archs.
+- This simplifies the build rules considerably, and
+  is closer to debian behavior.
 
  -- Maarten Lankhorst   Tue, 25 Feb 2014 
14:29:26 +0100
 
diff --git a/debian/control b/debian/control
index aaa5b0b..6bcb9a0 100644
--- a/debian/control
+++ b/debian/control
@@ -18,7 +18,7 @@ Build-Depends:
  libxfixes-dev,
  libxdamage-dev,
  libxext-dev,
- libvdpau-dev [amd64 i386 kfreebsd-amd64 kfreebsd-i386 armhf],
+ libvdpau-dev [linux-any kfreebsd-any],
  autoconf,
  automake,
  libtool,
@@ -49,7 +49,7 @@ Homepage: http://mesa3d.sourceforge.net/
 
 Package: libxatracker2
 Section: libs
-Architecture: amd64 armel armhf i386 powerpc
+Architecture: linux-any
 Depends:
  ${shlibs:Depends},
  ${misc:Depends},
@@ -64,7 +64,7 @@ Description: X acceleration library -- runtime
 Package: libxatracker2-dbg
 Section: debug
 Priority: extra
-Architecture: amd64 armel armhf i386 powerpc
+Architecture: linux-any
 Depends:
  libxa

Bug#739269: Please move libwayland-egl out of libegl1-mesa-drivers

2014-03-03 Thread Julien Cristau
On Mon, Mar  3, 2014 at 09:49:50 +0100, Sjoerd Simons wrote:

> It's meant to be used externally indeed. Any Wayland application that
> uses EGL/GLES2 should use it to e.g. transform a wayland surface into an
> EGLNativeWindow for use with the EGL stack.
> 
Right, sorry, that was a misunderstanding on my part.

> I did keep the .so/.pc etc in libegl1-mesa-dev (as they are currently)
> as libwayland-egl is both conceptually part of the EGL stack and tiny
> (the .h is not even 60 lines). I'm happy to update the patch to split it
> out into its own package as well though (as well as correct the other
> issues you've noted)
> 
I'm ok with keeping the -dev stuff within libegl1-mesa-dev if that's
easier or less wasteful.  And I'll be happy to apply and upload a new
version with the transition issue and package descriptions fixed.

Cheers,
Julien


signature.asc
Description: Digital signature


Re: Changes to 'debian-experimental': revert gallium 3D vdpau support

2014-03-03 Thread Julien Cristau
On Mon, Mar  3, 2014 at 10:23:29 +0100, Eric Valette wrote:

> Hi,
> 
> When I see this, and the remove "enable glamor by default" for ati/radeon X11
> driver, I wonder if you are on a personnal crusade against ATI/AMD . Do you
> want to discourage people of byuing AMD hardware? The progress of using
> hardware decoding via UVD using OSS software has been spectacular in the last
> moths and I've been using it on various APU (A350/A450/A5000).
> 
> These new and old APU are beeing used in many HTPC and  low cost laptop comme
> equiped with A5000 kabini chipsets and doing this kind of revert you will
> prevent anyone using them on debian without requiring catalyst drivers. Or is
> your goal to avoid support of gallium 3D by forcinf fglrx and then saying ask
> AMD to fix their bugs?
> 
You got me.

Cheers,
Julien


signature.asc
Description: Digital signature


mesa: Changes to 'ubuntu'

2014-03-03 Thread Maarten Lankhorst
 debian/control |   12 
 1 file changed, 4 insertions(+), 8 deletions(-)

New commits:
commit 06a5335674afd556791c3122af0ab98be6a3253d
Author: Maarten Lankhorst 
Date:   Mon Mar 3 15:55:56 2014 +0100

decrease delta in control with debian-experimental and remove 
replaces/breaks

They were never in a released ubuntu package, except the x-staging ppa.

diff --git a/debian/control b/debian/control
index 6bcb9a0..50d88f5 100644
--- a/debian/control
+++ b/debian/control
@@ -49,7 +49,7 @@ Homepage: http://mesa3d.sourceforge.net/
 
 Package: libxatracker2
 Section: libs
-Architecture: linux-any
+Architecture: linux-any 
 Depends:
  ${shlibs:Depends},
  ${misc:Depends},
@@ -219,10 +219,6 @@ Depends:
  libglapi-mesa (= ${binary:Version}),
 # for libllvmradeon
  libgl1-mesa-dri (= ${binary:Version}) [any-i386 any-amd64],
-Replaces:
- libwayland-egl1-mesa (<= 10.1.0~rc2)
-Breaks:
- libwayland-egl1-mesa (<= 10.1.0~rc2)
 Pre-Depends: ${misc:Pre-Depends}
 Multi-Arch: same
 Description: free implementation of the EGL API -- hardware drivers
@@ -251,7 +247,7 @@ Description: free implementation of the EGL API -- driver 
debugging symbols
 
 Package: libopenvg1-mesa
 Section: libs
-Architecture: linux-any
+Architecture: linux-any kfreebsd-any
 Depends:
  ${shlibs:Depends},
  ${misc:Depends},
@@ -270,7 +266,7 @@ Description: free implementation of the OpenVG API -- 
runtime
 Package: libopenvg1-mesa-dbg
 Section: debug
 Priority: extra
-Architecture: linux-any
+Architecture: linux-any kfreebsd-any
 Depends:
  libopenvg1-mesa (= ${binary:Version}),
  ${misc:Depends},
@@ -286,7 +282,7 @@ Description: free implementation of the OpenVG API -- 
debugging symbols
 
 Package: libopenvg1-mesa-dev
 Section: libdevel
-Architecture: linux-any
+Architecture: linux-any kfreebsd-any
 Depends:
  libopenvg1-mesa (= ${binary:Version}),
  libegl1-mesa-dev,


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/e1wkuie-0003bb...@moszumanska.debian.org



xterm: Changes to 'pristine-tar'

2014-03-03 Thread Sven Joachim
 xterm_302.orig.tar.gz.delta |binary
 xterm_302.orig.tar.gz.id|1 +
 2 files changed, 1 insertion(+)

New commits:
commit fde92c7a80688b0c305b06c52218d262d207feea
Author: Sven Joachim 
Date:   Mon Mar 3 18:44:38 2014 +0100

pristine-tar data for xterm_302.orig.tar.gz

diff --git a/xterm_302.orig.tar.gz.delta b/xterm_302.orig.tar.gz.delta
new file mode 100644
index 000..11dcbe3
Binary files /dev/null and b/xterm_302.orig.tar.gz.delta differ
diff --git a/xterm_302.orig.tar.gz.id b/xterm_302.orig.tar.gz.id
new file mode 100644
index 000..b528a91
--- /dev/null
+++ b/xterm_302.orig.tar.gz.id
@@ -0,0 +1 @@
+32cf3491bbe81df3bef977c4f07fdb2c7890


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/e1wkxuo-fk...@moszumanska.debian.org



xterm: Changes to 'upstream-unstable'

2014-03-03 Thread Sven Joachim
 MANIFEST |2 
 Makefile.in  |   21 -
 charproc.c   |   30 +---
 data.h   |7 +
 main.c   |   26 ---
 minstall.in  |   10 +-
 misc.c   |  174 ---
 package/debian/changelog |6 +
 package/debian/control   |2 
 package/debian/rules |2 
 package/freebsd/Makefile |2 
 package/xterm.spec   |   39 +-
 ptyx.h   |   26 +--
 trace.c  |7 +
 version.h|6 -
 vttests/256colors.pl |   13 ++-
 vttests/256colors2.pl|   13 +--
 vttests/88colors.pl  |   11 ++
 vttests/88colors2.pl |   13 +--
 vttests/dynamic.pl   |7 +
 vttests/paste64.pl   |8 +-
 vttests/query-color.pl   |7 +
 vttests/query-fonts.pl   |7 +
 vttests/resize.pl|   28 +--
 vttests/tcapquery.pl |7 +
 xterm.h  |4 -
 xterm.log.html   |   53 ++
 xterm.man|   53 ++
 28 files changed, 413 insertions(+), 171 deletions(-)

New commits:
commit f5a1486f17c95692747293c2400117ea79439c88
Author: Sven Joachim 
Date:   Mon Mar 3 18:44:37 2014 +0100

Imported Upstream version 302

diff --git a/MANIFEST b/MANIFEST
index 95ab9da..bc11abb 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1,4 +1,4 @@
-MANIFEST for xterm-301, version xterm-301
+MANIFEST for xterm-302, version xterm-302
 

 MANIFESTthis file
 256colres.h resource-definitions for 256-color mode
diff --git a/Makefile.in b/Makefile.in
index a468ff5..1dc71ef 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,8 +1,8 @@
-## $XTermId: Makefile.in,v 1.223 2013/06/23 23:40:18 tom Exp $
+## $XTermId: Makefile.in,v 1.225 2014/03/01 15:15:26 tom Exp $
 # -
 # this file is part of xterm
 #
-# Copyright 1997-2012,2013 by Thomas E. Dickey
+# Copyright 1997-2013,2014 by Thomas E. Dickey
 #
 # All Rights Reserved
 #
@@ -189,6 +189,21 @@ resize$x : $(OBJS2)
perl $(srcdir)/88colres.pl > $@
 
 charproc$o : main.h @CHARPROC_DEPS@
+
+misc$o : builtin_icons.h
+
+# do this to quiet gcc -Wcast-qual warnings 
+builtin_icons.h :
+   @echo "#if OPT_BUILTIN_XPMS" >$@
+   @echo "#include " >>$@
+   @echo "#include " >>$@
+   @echo "#include " >>$@
+   @echo "#include " >>$@
+   @echo "#else" >>$@
+   @sed -e 's/static char \* /static const char * /' 
$(srcdir)/icons/mini.xterm_48x48.xpm >>$@
+   @echo "#endif" >>$@
+   @echo "made $@"
+
 

 actual_xterm  = `echo xterm|sed '$(transform)'`
 actual_resize = `echo resize|   sed '$(transform)'`
@@ -418,7 +433,7 @@ mostlyclean :
-$(RM) *$o *.[is] XtermLog.* .pure core *~ *.bak *.BAK *.out *.tmp
 
 clean : mostlyclean
-   -$(RM) $(PROGRAMS)
+   -$(RM) $(PROGRAMS) builtin_icons.h 
 
 distclean :: clean
-$(RM) Makefile config.status config.cache config.log xtermcfg.h
diff --git a/charproc.c b/charproc.c
index 4991f68..1ebd75d 100644
--- a/charproc.c
+++ b/charproc.c
@@ -1,7 +1,7 @@
-/* $XTermId: charproc.c,v 1.1319 2013/11/26 20:38:11 tom Exp $ */
+/* $XTermId: charproc.c,v 1.1322 2014/03/02 23:32:05 tom Exp $ */
 
 /*
- * Copyright 1999-2012,2013 by Thomas E. Dickey
+ * Copyright 1999-2013,2014 by Thomas E. Dickey
  *
  * All Rights Reserved
  *
@@ -3924,12 +3924,16 @@ doparsing(XtermWidget xw, unsigned c, struct ParseState 
*sp)
 * command-line, allow it to be enabled/disabled by
 * control sequence.
 */
+   TRACE(("CASE_UTF8 wide:%d, utf8:%d, req:%s\n",
+  screen->wide_chars,
+  screen->utf8_mode,
+  BtoS(c == 'G')));
+   if ((!screen->wide_chars) && (c == 'G')) {
+   WriteNow();
+   ChangeToWide(xw);
+   }
if (screen->wide_chars
-   && screen->utf8_mode != uAlways) {
-   if (!screen->wide_chars) {
-   WriteNow();
-   ChangeToWide(xw);
-   }
+   && !screen->utf8_always) {
switchPtyData(screen, c == 'G');
TRACE(("UTF8 mode %s\n",
   BtoS(screen->utf8_mode)));
@@ -6937,6 +6941,7 @@ VTInitialize_locale(XtermWidget xw)
 TRACE(("... request screen.utf8_mode = %d\n", screen->utf8_mode));
 TRACE(("... request screen.utf8_fonts = %d\n", screen->utf8_fonts));
 
+screen->utf8_always = (screen->utf8_mode == uAlways);
 if (screen->utf8_mode < 0)
screen->utf8_mode = uFalse;
 
@@ -7397,6 +7402,11 @@ VTInitialize(Widget wrequest,
  */
 TScreenOf(wn

xterm: Changes to 'debian-unstable'

2014-03-03 Thread Sven Joachim
 MANIFEST|2 
 Makefile.in |   21 -
 charproc.c  |   30 +
 data.h  |7 
 debian/changelog|9 
 debian/local/xterm.faq.html |  777 
 debian/upstream/signing-key.asc |   24 +
 debian/watch|2 
 main.c  |   26 -
 minstall.in |   10 
 misc.c  |  174 +---
 package/debian/changelog|6 
 package/debian/control  |2 
 package/debian/rules|2 
 package/freebsd/Makefile|2 
 package/xterm.spec  |   39 +-
 ptyx.h  |   26 +
 trace.c |7 
 version.h   |6 
 vttests/256colors.pl|   13 
 vttests/256colors2.pl   |   13 
 vttests/88colors.pl |   11 
 vttests/88colors2.pl|   13 
 vttests/dynamic.pl  |7 
 vttests/paste64.pl  |8 
 vttests/query-color.pl  |7 
 vttests/query-fonts.pl  |7 
 vttests/resize.pl   |   28 +
 vttests/tcapquery.pl|7 
 xterm.h |4 
 xterm.log.html  |   53 ++
 xterm.man   |   53 ++
 32 files changed, 852 insertions(+), 544 deletions(-)

New commits:
commit aec7c9ef6b87b5fce4de8a2b53d91623a1045e02
Author: Sven Joachim 
Date:   Mon Mar 3 19:07:23 2014 +0100

Update copy of XTerm FAQ to revision 1.278 (dated 2014/02/24)

The paragraph that mentions /usr/lib/X11/app-defaults/XTerm has been
rewritten to clarify that it applies to Solaris only.

diff --git a/debian/changelog b/debian/changelog
index 80e5f94..a7bbeff 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 xterm (302-1) UNRELEASED; urgency=low
 
   * New upstream release.
+  * Update copy of XTerm FAQ to revision 1.278 (dated 2014/02/24)
+(Closes: #737692).
   * Check GPG signature of upstream tarballs in the watch file.
 
  -- Sven Joachim   Mon, 03 Mar 2014 18:39:43 +0100
diff --git a/debian/local/xterm.faq.html b/debian/local/xterm.faq.html
index 312fa10..026dfe1 100644
--- a/debian/local/xterm.faq.html
+++ b/debian/local/xterm.faq.html
@@ -1,6 +1,6 @@
 
 
 
@@ -33,6 +32,10 @@
   mailto:dic...@invisible-island.net";>
   
+  
+  
   
   
   
-@import "/css/simplenav15.css" all;
+@import "/css/simplenavXX.css" all;
   
 
 
 
   
 
-  http://invisible-island.net/http://invisible-island.net/xterm/
-  Copyright © 1997-2012,2013 by Thomas E. Dickey
+  Copyright © 1997-2013,2014 by Thomas E. Dickey
   
 
-  Here is the latest version of
-  this file.
+  http://invisible-island.net/xterm/xterm.faq.html";>Here is
+  the latest version of this file.
+
+  XTerm – Frequently Asked Questions
+  (FAQ)
 
   
 
-  (top)
+  (top)
 
-  What is
+  What is
   XTerm?
 
-  Who wrote
+  Who wrote
   XTerm?
 
-  What is a
-  VT220?
+  What is a VT220?
 
-  What platforms
-  does it run on?
+  What platforms does it run
+  on?
 
-  What is the
-  latest version?
+  What is the latest
+  version?
 
-  What versions are
+  What versions are
   available?
 
-  Comparing
-  versions, by counting controls
+  Comparing versions, by
+  counting controls
 
-  How do I ...
+  How do I ...
 
-  Frequent
-  problems
+  Frequent problems
 
-  Known Bugs in
+  Known Bugs in
   XTerm and Look–alikes
 
-  How do I build
+  How do I build
   XTerm?
 
-  How do I report
-  bugs?
+  How do I report bugs?
 
-  Additional
-  Information
+  Additional Information
 
-  Ongoing/future
-  work
+  Ongoing/future work
 
   
 
@@ -130,8 +133,8 @@
   it.
 
   As a stylistic convention, the capitalized form is
-  "XTerm", which corresponds to the X resource class name.
-  Similarly, uxterm becomes "UXTerm".
+  "XTerm", which corresponds to the X resource class name.
+  Similarly, uxterm becomes "UXTerm".
 
   Who
   wrote XTerm?
@@ -233,15 +236,15 @@
   Involvement
 
   My involvement with xterm through XFree86
-  began at the end of 1995. This
-  website has been "here" since 2001/6/5, replacing my ClarkNet
-  page. I started the ClarkNet page 1996/12/31, as a followup to
-  the http://invisible-island.net/ncurses/ncurses-license.html#patch_961224";>
-  release of ncurses 4.0) which featured xterm as one of the 16
-  programs I was involved with. From the outset, the page provided
-  a link to a snapshot of the current source. Copies of patches
-  which I sent to XFree86 were available on the ftp area.
+  began at the end of 1995.
+  This website has been "here" since 2001/6/5, replacing my
+  ClarkNet page. I started the ClarkNet page 1996/12/31, as a
+  followup to the release of ncurses
+  4.0) which fea

mesa: Changes to 'debian-experimental'

2014-03-03 Thread Andreas Boll
 debian/changelog |1 
 debian/control   |   37 +++
 debian/mesa-vdpau-drivers.install.in |1 
 debian/rules |3 +-
 4 files changed, 41 insertions(+), 1 deletion(-)

New commits:
commit 53bb4371dfab2fb5c0b77415ea685608598fa229
Author: Andreas Boll 
Date:   Mon Mar 3 17:47:31 2014 +0100

Enable building drivers for libvdpau1

Based on patches from
Maarten Lankhorst 

diff --git a/debian/changelog b/debian/changelog
index f751601..426da55 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ mesa (10.1.0~rc3-1) UNRELEASED; urgency=medium
 
   [ Andreas Boll ]
   * Disable dri3 on !linux
+  * Enable building drivers for libvdpau1 (Closes: #705558).
 
   [ Maarten Lankhorst ]
   * New upstream release.
diff --git a/debian/control b/debian/control
index 16ca5cf..c63e630 100644
--- a/debian/control
+++ b/debian/control
@@ -17,6 +17,7 @@ Build-Depends:
  libxfixes-dev,
  libxdamage-dev,
  libxext-dev,
+ libvdpau-dev [linux-any kfreebsd-any],
  autoconf,
  automake,
  libtool,
@@ -750,4 +751,40 @@ Description: Mesa Off-screen rendering extension -- 
development files
  .
  For more information on OSmesa see the libosmesa6 package.
 
+Package: mesa-vdpau-drivers
+Section: libs
+Architecture: linux-any kfreebsd-any
+Depends:
+ libvdpau1,
+ ${shlibs:Depends},
+ ${misc:Depends},
+Enhances:
+ libvdpau1,
+Provides:
+ vdpau-driver,
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
+Description: Mesa VDPAU video acceleration drivers
+ These libraries provide the Video Decode and Presentation API for Unix.
+ They provide accelerated video playback (incl. H.264) and video
+ post-processing for the supported graphics cards.
+ .
+ This package enables support for VDPAU for some gallium drivers.
+
+Package: mesa-vdpau-drivers-dbg
+Section: debug
+Priority: extra
+Architecture: linux-any kfreebsd-any
+Depends:
+ libvdpau1-mesa-drivers (= ${binary:Version}),
+ ${misc:Depends},
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
+Description: Debugging symbols for the Mesa VDPAU video acceleration drivers
+ These libraries provide the Video Decode and Presentation API for Unix.
+ They provide accelerated video playback (incl. H.264) and video
+ post-processing for the supported graphics cards.
+ .
+ This package contains the debugging symbols for the VDPAU drivers.
+
 # vim: tw=0
diff --git a/debian/mesa-vdpau-drivers.install.in 
b/debian/mesa-vdpau-drivers.install.in
new file mode 100644
index 000..50c703c
--- /dev/null
+++ b/debian/mesa-vdpau-drivers.install.in
@@ -0,0 +1 @@
+dri/usr/lib/${DEB_HOST_MULTIARCH}/vdpau/*.so* 
usr/lib/${DEB_HOST_MULTIARCH}/vdpau/
diff --git a/debian/rules b/debian/rules
index b148e5f..2ba8af0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -105,6 +105,7 @@ else
 
confflags_DIRECT_RENDERING = --enable-driglx-direct
confflags_OPENVG = --enable-openvg --enable-gallium-egl
+   confflags_GALLIUM += --enable-vdpau
 endif
 confflags_EGL = --with-egl-platforms="$(EGL_DISPLAYS)"
 confflags_GLES = --enable-gles1 --enable-gles2
@@ -120,7 +121,7 @@ confflags-dri = \
--enable-shared-glapi \
--enable-texture-float \
--enable-xa \
-   --disable-xvmc --disable-vdpau \
+   --disable-xvmc \
$(confflags_DIRECT_RENDERING) \
$(confflags_DRI3) \
$(confflags_EGL) \


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/e1wkyod-0001mw...@moszumanska.debian.org