wayland: Changes to 'ubuntu'
COPYING.GPL-2 | 339 -----------------------------------------------
ChangeLog | 59 ++++++++
configure.ac | 4
debian/changelog | 19 ++
debian/watch | 3
protocol/wayland.xml | 10 -
spec/main.tex | 2
src/scanner.c | 3
src/wayland-client.c | 1
src/wayland-client.pc.in | 2
src/wayland-server.pc.in | 2
src/wayland-util.h | 18 +-
12 files changed, 101 insertions(+), 361 deletions(-)
New commits:
commit 4ea1e5debec1098465206c3b580c75f03f3b0d7f
Author: Timo Aaltonen <tjaalton@ubuntu.com>
Date: Thu Feb 23 11:58:28 2012 +0200
update the changelog
diff --git a/debian/changelog b/debian/changelog
index 57a921b..fb7d1b1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+wayland (0.85.0-1ubuntu1) UNRELEASED; urgency=low
+
+ * Merge from Debian experimental. For the remaining changes see
+ the changelog entry from 0.1.0~2-1ubuntu1.
+ * Drop COPYING.GPL-2, the project uses MIT/X11 license for the most
+ part, the rest is explained in debian/copyright.
+
+ -- Timo Aaltonen <tjaalton@ubuntu.com> Thu, 23 Feb 2012 11:55:38 +0200
+
wayland (0.85.0-1) experimental; urgency=low
* First upstream release:
commit 9f99d629c97d57d04cbbff4cf478ed1611723da0
Author: Timo Aaltonen <tjaalton@ubuntu.com>
Date: Thu Feb 23 11:55:03 2012 +0200
drop unnecessary diff to debian
diff --git a/COPYING.GPL-2 b/COPYING.GPL-2
deleted file mode 100644
index d159169..0000000
--- a/COPYING.GPL-2
+++ /dev/null
@@ -1,339 +0,0 @@
- GNU GENERAL PUBLIC LICENSE
- Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
- Preamble
-
- The licenses for most software are designed to take away your
-freedom to share and change it. By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users. This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it. (Some other Free Software Foundation software is covered by
-the GNU Lesser General Public License instead.) You can apply it to
-your programs, too.
-
- When we speak of free software, we are referring to freedom, not
-price. Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
- To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
- For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have. You must make sure that they, too, receive or can get the
-source code. And you must show them these terms so they know their
-rights.
-
- We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
- Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software. If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
- Finally, any free program is threatened constantly by software
-patents. We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary. To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
- The precise terms and conditions for copying, distribution and
-modification follow.
-
- GNU GENERAL PUBLIC LICENSE
- TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
- 0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License. The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language. (Hereinafter, translation is included without limitation in
-the term "modification".) Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope. The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
- 1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
- 2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
- a) You must cause the modified files to carry prominent notices
- stating that you changed the files and the date of any change.
-
- b) You must cause any work that you distribute or publish, that in
- whole or in part contains or is derived from the Program or any
- part thereof, to be licensed as a whole at no charge to all third
- parties under the terms of this License.
-
- c) If the modified program normally reads commands interactively
- when run, you must cause it, when started running for such
- interactive use in the most ordinary way, to print or display an
- announcement including an appropriate copyright notice and a
- notice that there is no warranty (or else, saying that you provide
- a warranty) and that users may redistribute the program under
- these conditions, and telling the user how to view a copy of this
- License. (Exception: if the Program itself is interactive but
- does not normally print such an announcement, your work based on
- the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole. If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works. But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
- 3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
- a) Accompany it with the complete corresponding machine-readable
- source code, which must be distributed under the terms of Sections
- 1 and 2 above on a medium customarily used for software interchange; or,
-
- b) Accompany it with a written offer, valid for at least three
- years, to give any third party, for a charge no more than your
- cost of physically performing source distribution, a complete
- machine-readable copy of the corresponding source code, to be
- distributed under the terms of Sections 1 and 2 above on a medium
- customarily used for software interchange; or,
-
- c) Accompany it with the information you received as to the offer
- to distribute corresponding source code. (This alternative is
- allowed only for noncommercial distribution and only if you
- received the program in object code or executable form with such
- an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it. For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable. However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
- 4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License. Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
- 5. You are not required to accept this License, since you have not
-signed it. However, nothing else grants you permission to modify or
-distribute the Program or its derivative works. These actions are
-prohibited by law if you do not accept this License. Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
- 6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions. You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
- 7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License. If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all. For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices. Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
- 8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded. In such case, this License incorporates
-the limitation as if written in the body of this License.
-
- 9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time. Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number. If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation. If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
- 10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission. For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this. Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
- NO WARRANTY
-
- 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
- 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
- END OF TERMS AND CONDITIONS
-
- How to Apply These Terms to Your New Programs
-
- If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
- To do so, attach the following notices to the program. It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
- <one line to give the program's name and a brief idea of what it does.>
- Copyright (C) <year> <name of author>
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License along
- with this program; if not, write to the Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
- Gnomovision version 69, Copyright (C) year name of author
- Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
- This is free software, and you are welcome to redistribute it
- under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License. Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary. Here is a sample; alter the names:
-
- Yoyodyne, Inc., hereby disclaims all copyright interest in the program
- `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
- <signature of Ty Coon>, 1 April 1989
- Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs. If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library. If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.
commit 2cc0f08956b95971d67a69c3d382ec101fafa200
Author: Cyril Brulebois <kibi@debian.org>
Date: Fri Feb 10 11:51:43 2012 +0100
Upload to experimental.
diff --git a/debian/changelog b/debian/changelog
index 49edce8..bb51de9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-wayland (0.85.0-1) UNRELEASED; urgency=low
+wayland (0.85.0-1) experimental; urgency=low
* First upstream release:
- http://article.gmane.org/gmane.comp.freedesktop.wayland.devel/1770
@@ -6,7 +6,7 @@ wayland (0.85.0-1) UNRELEASED; urgency=low
upstream releases xz tarballs, and the 1.0 source format only suports
gz.
- -- Cyril Brulebois <kibi@debian.org> Fri, 10 Feb 2012 11:26:53 +0100
+ -- Cyril Brulebois <kibi@debian.org> Fri, 10 Feb 2012 11:51:36 +0100
wayland (0.1.0~2-1) experimental; urgency=low
commit 4bfeae576f8c38ec66bf72dff9d15205f144d50d
Author: Cyril Brulebois <kibi@debian.org>
Date: Fri Feb 10 11:29:13 2012 +0100
Update watch file.
diff --git a/debian/changelog b/debian/changelog
index 286d9c5..49edce8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,9 @@ wayland (0.85.0-1) UNRELEASED; urgency=low
* First upstream release:
- http://article.gmane.org/gmane.comp.freedesktop.wayland.devel/1770
+ * Update watch file, even if that's only useful for notifications:
+ upstream releases xz tarballs, and the 1.0 source format only suports
+ gz.
-- Cyril Brulebois <kibi@debian.org> Fri, 10 Feb 2012 11:26:53 +0100
diff --git a/debian/watch b/debian/watch
index 5f6c0ec..bcc66e6 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,3 @@
#git=git://anongit.freedesktop.org/wayland/wayland
-# No release, so no tarball, yet.
+version=3
+http://wayland.freedesktop.org/releases/wayland-(.*)\.tar\.xz
commit 0c4350ab33acf6b9d72e637d51eeddfacec56ab4
Author: Cyril Brulebois <kibi@debian.org>
Date: Fri Feb 10 11:28:26 2012 +0100
Bump changelogs.
diff --git a/ChangeLog b/ChangeLog
index f3c940d..bad9d3d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,62 @@
+commit 28e3cbc654a81c35a2948af93d6e86911159a13f
+Author: Kristian Høgsberg <krh@bitplanet.net>
+Date: Thu Feb 9 11:16:30 2012 -0500
+
+ Release 0.85.0
+
+commit 7c6dac8740f26f0fd2440016c218a9862fdfc271
+Author: Kristian Høgsberg <krh@bitplanet.net>
+Date: Thu Feb 9 11:15:33 2012 -0500
+
+ Use dist-xz for tarballs
+
+commit c6b37ac05566d0a233da69a4f6b35409b278de34
+Author: Kristian Høgsberg <krh@bitplanet.net>
+Date: Thu Feb 9 11:12:18 2012 -0500
+
+ Set version to 'master' on git master branch
+
+commit 8f9de83f7b1f9c6bc265fec4aec35eff0e9164a0
+Author: Tiago Vignatti <tiago.vignatti@intel.com>
+Date: Tue Jan 24 18:30:13 2012 +0200
+
+ scanner: don't print new line when no descriptions are provided
+
+ Signed-off-by: Tiago Vignatti <tiago.vignatti@intel.com>
+
+commit 899652201f0be57b5dc664c5e4d0eeaf2caf34a7
+Author: Tiago Vignatti <tiago.vignatti@intel.com>
+Date: Tue Jan 24 17:49:28 2012 +0200
+
+ protocol: fix typo
+
+ Signed-off-by: Tiago Vignatti <tiago.vignatti@intel.com>
+
+commit 3cce6be20d5f81810d00eb89ae09eaa0025e10b3
+Author: Tiago Vignatti <tiago.vignatti@intel.com>
+Date: Tue Jan 24 16:11:33 2012 +0200
+
+ spec: fix typo
+
+ Signed-off-by: Tiago Vignatti <tiago.vignatti@intel.com>
+
+commit 0bcb30a9a010790f6258c890000765b17f539a46
+Author: Kristian Høgsberg <krh@bitplanet.net>
+Date: Thu Feb 9 08:28:21 2012 -0500
+
+ Drop warning when we receive an event for zombie objects
+
+ Business as usual, but the message is confusing.
+
+commit fa525622e33216207b6bba6ef5b4c434d565e4d1
+Author: Kristian Høgsberg <krh@bitplanet.net>
+Date: Tue Jan 24 09:52:25 2012 -0500
+
+ wayland-util.h: Avoid un-namespaced _container_of
+
+ Yes, there are worse offenders in that file, but this one isn't used in
+ the code and it makes Xorg angry.
+
commit 10eefa49470d97948719f58dfb62a97fb4701aed
Author: Jesse Barnes <jbarnes@virtuousgeek.org>
Date: Wed Jan 18 10:06:02 2012 -0800
diff --git a/debian/changelog b/debian/changelog
index bf5675e..286d9c5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+wayland (0.85.0-1) UNRELEASED; urgency=low
+
+ * First upstream release:
+ - http://article.gmane.org/gmane.comp.freedesktop.wayland.devel/1770
+
+ -- Cyril Brulebois <kibi@debian.org> Fri, 10 Feb 2012 11:26:53 +0100
+
wayland (0.1.0~2-1) experimental; urgency=low
* New upstream snapshot.
commit 28e3cbc654a81c35a2948af93d6e86911159a13f
Author: Kristian Høgsberg <krh@bitplanet.net>
Date: Thu Feb 9 11:16:30 2012 -0500
Release 0.85.0
diff --git a/configure.ac b/configure.ac
index a1c9d2a..e04deba 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
AC_PREREQ([2.64])
AC_INIT([wayland],
- [master],
+ [0.85.0],
[https://bugs.freedesktop.org/enter_bug.cgi?product=wayland],
[wayland],
[http://wayland.freedesktop.org/])
diff --git a/src/wayland-client.pc.in b/src/wayland-client.pc.in
index 59a925d..7e17532 100644
--- a/src/wayland-client.pc.in
+++ b/src/wayland-client.pc.in
@@ -5,6 +5,6 @@ includedir=${prefix}/include
Name: Wayland Client
Description: Wayland client side library
-Version: 0.1
+Version: 0.85
Cflags: -I${includedir}
Libs: -L${libdir} -lwayland-client
diff --git a/src/wayland-server.pc.in b/src/wayland-server.pc.in
index b317461..36e60cc 100644
--- a/src/wayland-server.pc.in
+++ b/src/wayland-server.pc.in
@@ -5,6 +5,6 @@ includedir=${prefix}/include
Name: Wayland Server
Description: Server side implementation of the Wayland protocol
-Version: 0.1
+Version: 0.85
Cflags: -I${includedir}
Libs: -L${libdir} -lwayland-server
commit 7c6dac8740f26f0fd2440016c218a9862fdfc271
Author: Kristian Høgsberg <krh@bitplanet.net>
Date: Thu Feb 9 11:15:33 2012 -0500
Use dist-xz for tarballs
diff --git a/configure.ac b/configure.ac
index edf3d4f..a1c9d2a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8,7 +8,7 @@ AC_INIT([wayland],
AC_CONFIG_HEADERS([config.h])
AC_CONFIG_MACRO_DIR([m4])
-AM_INIT_AUTOMAKE([1.11 foreign dist-bzip2])
+AM_INIT_AUTOMAKE([1.11 foreign no-dist-gzip dist-xz])
AM_SILENT_RULES([yes])
commit c6b37ac05566d0a233da69a4f6b35409b278de34
Author: Kristian Høgsberg <krh@bitplanet.net>
Date: Thu Feb 9 11:12:18 2012 -0500
Set version to 'master' on git master branch
diff --git a/configure.ac b/configure.ac
index 3ea77e6..edf3d4f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
AC_PREREQ([2.64])
AC_INIT([wayland],
- [0.1],
+ [master],
[https://bugs.freedesktop.org/enter_bug.cgi?product=wayland],
[wayland],
[http://wayland.freedesktop.org/])
commit 8f9de83f7b1f9c6bc265fec4aec35eff0e9164a0
Author: Tiago Vignatti <tiago.vignatti@intel.com>
Date: Tue Jan 24 18:30:13 2012 +0200
scanner: don't print new line when no descriptions are provided
Signed-off-by: Tiago Vignatti <tiago.vignatti@intel.com>
diff --git a/src/scanner.c b/src/scanner.c
index f88fb4d..699782f 100644
--- a/src/scanner.c
+++ b/src/scanner.c
@@ -661,8 +661,9 @@ emit_structs(struct wl_list *message_list, struct interface *interface)
if (mdesc) {
printf("\t * ");
desc_dump(mdesc->text, 8);
+ printf("\n");
}
- printf("\n\t */\n");
+ printf("\t */\n");
printf("\tvoid (*%s)(", m->name);
n = strlen(m->name) + 17;
commit 899652201f0be57b5dc664c5e4d0eeaf2caf34a7
Author: Tiago Vignatti <tiago.vignatti@intel.com>
Date: Tue Jan 24 17:49:28 2012 +0200
protocol: fix typo
Signed-off-by: Tiago Vignatti <tiago.vignatti@intel.com>
diff --git a/protocol/wayland.xml b/protocol/wayland.xml
index cad2507..c445d3f 100644
--- a/protocol/wayland.xml
+++ b/protocol/wayland.xml
@@ -7,7 +7,7 @@
Permission to use, copy, modify, distribute, and sell this
software and its documentation for any purpose is hereby granted
- without fee, provided that\n the above copyright notice appear in
+ without fee, provided that the above copyright notice appear in
all copies and that both that copyright notice and this permission
notice appear in supporting documentation, and that the name of
the copyright holders not be used in advertising or publicity
@@ -172,7 +172,7 @@
A buffer provides the content for a wl_surface. Buffers are
created through factory interfaces such as wl_drm, wl_shm or
similar. It has a width and a height and can be attached to a
- wl_surface, but the mechnism by which a client provides and
+ wl_surface, but the mechanism by which a client provides and
updates the contents is defined by the buffer factory interface
</description>
@@ -197,7 +197,7 @@
</request>
<event name="release">
- <description summary="compositor releses buffer">
+ <description summary="compositor releases buffer">
Sent when an attached buffer is no longer used by the compositor.
</description>
</event>
@@ -589,7 +589,7 @@
Notification that this input device's pointer is focused on
certain surface. When an input_device enters a surface, the
pointer image is undefined and a client should respond to this
- event by setting an apropriate pointer image.
+ event by setting an appropriate pointer image.
</description>
<arg name="time" type="uint"/>
@@ -643,7 +643,7 @@
<interface name="wl_output" version="1">
- <description summary="composior output region">
+ <description summary="compositor output region">
An output describes part of the compositor geometry. The
compositor work in the 'compositor coordinate system' and an
output corresponds to rectangular area in that space that is
commit 3cce6be20d5f81810d00eb89ae09eaa0025e10b3
Author: Tiago Vignatti <tiago.vignatti@intel.com>
Date: Tue Jan 24 16:11:33 2012 +0200
spec: fix typo
Signed-off-by: Tiago Vignatti <tiago.vignatti@intel.com>
diff --git a/spec/main.tex b/spec/main.tex
index 756bf38..59d4fe0 100644
--- a/spec/main.tex
+++ b/spec/main.tex
@@ -22,7 +22,7 @@
\subsection{Replacing X11}
In Linux and other Unix-like systems, the X stack has grown to
-encompass funcationality arguably belonging in client libraries,
+encompass functionality arguably belonging in client libraries,
helper libraries, or the host operating system kernel. Support for
things like PCI resource management, display configuration management,
direct rendering, and memory management has been integrated into the X
commit 0bcb30a9a010790f6258c890000765b17f539a46
Author: Kristian Høgsberg <krh@bitplanet.net>
Date: Thu Feb 9 08:28:21 2012 -0500
Drop warning when we receive an event for zombie objects
Business as usual, but the message is confusing.
diff --git a/src/wayland-client.c b/src/wayland-client.c
index bbfc035..7814379 100644
--- a/src/wayland-client.c
+++ b/src/wayland-client.c
@@ -465,7 +465,6 @@ handle_event(struct wl_display *display,
proxy = wl_map_lookup(&display->objects, id);
if (proxy == WL_ZOMBIE_OBJECT) {
- fprintf(stderr, "Message to zombie object\n");
wl_connection_consume(display->connection, size);
return;
} else if (proxy == NULL || proxy->object.implementation == NULL) {
commit fa525622e33216207b6bba6ef5b4c434d565e4d1
Author: Kristian Høgsberg <krh@bitplanet.net>
Date: Tue Jan 24 09:52:25 2012 -0500
wayland-util.h: Avoid un-namespaced _container_of
Yes, there are worse offenders in that file, but this one isn't used in
the code and it makes Xorg angry.
diff --git a/src/wayland-util.h b/src/wayland-util.h
index f56af59..25c0901 100644
--- a/src/wayland-util.h
+++ b/src/wayland-util.h
@@ -107,32 +107,32 @@ int wl_list_empty(struct wl_list *list);
void wl_list_insert_list(struct wl_list *list, struct wl_list *other);
#ifdef __GNUC__
-#define __container_of(ptr, sample, member) \
+#define __wl_container_of(ptr, sample, member) \
(__typeof__(sample))((char *)(ptr) - \
((char *)&(sample)->member - (char *)(sample)))
#else
-#define __container_of(ptr, sample, member) \
+#define __wl_container_of(ptr, sample, member) \
(void *)((char *)(ptr) - \
((char *)&(sample)->member - (char *)(sample)))
#endif
#define wl_list_for_each(pos, head, member) \
- for (pos = 0, pos = __container_of((head)->next, pos, member); \
+ for (pos = 0, pos = __wl_container_of((head)->next, pos, member); \
&pos->member != (head); \
- pos = __container_of(pos->member.next, pos, member))
+ pos = __wl_container_of(pos->member.next, pos, member))
#define wl_list_for_each_safe(pos, tmp, head, member) \
for (pos = 0, tmp = 0, \
- pos = __container_of((head)->next, pos, member), \
- tmp = __container_of((pos)->member.next, tmp, member); \
+ pos = __wl_container_of((head)->next, pos, member), \
+ tmp = __wl_container_of((pos)->member.next, tmp, member); \
&pos->member != (head); \
pos = tmp, \
- tmp = __container_of(pos->member.next, tmp, member))
+ tmp = __wl_container_of(pos->member.next, tmp, member))
#define wl_list_for_each_reverse(pos, head, member) \
- for (pos = 0, pos = __container_of((head)->prev, pos, member); \
+ for (pos = 0, pos = __wl_container_of((head)->prev, pos, member); \
&pos->member != (head); \
- pos = __container_of(pos->member.prev, pos, member))
+ pos = __wl_container_of(pos->member.prev, pos, member))
struct wl_array {
uint32_t size;
Reply to: