From f2f3109fec96875fceeffe503f25b692b27fe065 Mon Sep 17 00:00:00 2001 From: "jk7744.park" Date: Sat, 24 Oct 2015 17:21:39 +0900 Subject: [PATCH] tizen 2.4 release --- .gitignore | 78 ++++++++++++++++++++++++++++++++ Makefile.am | 6 +-- autogen.sh | 12 +++++ configure.ac | 97 ++++++++++++++++++++-------------------- include/X11/extensions/Xdamage.h | 2 +- packaging/baselibs.conf | 1 + packaging/libXdamage.changes | 6 +++ packaging/libXdamage.manifest | 5 +++ packaging/libXdamage.spec | 4 +- src/Makefile.am | 2 +- src/Xdamage.c | 28 ++++++------ src/xdamageint.h | 2 - 12 files changed, 171 insertions(+), 72 deletions(-) create mode 100644 .gitignore create mode 100755 autogen.sh create mode 100644 packaging/baselibs.conf create mode 100644 packaging/libXdamage.changes create mode 100644 packaging/libXdamage.manifest diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..568d511 --- /dev/null +++ b/.gitignore @@ -0,0 +1,78 @@ +# +# X.Org module default exclusion patterns +# The next section if for module specific patterns +# +# Do not edit the following section +# GNU Build System (Autotools) +aclocal.m4 +autom4te.cache/ +autoscan.log +ChangeLog +compile +config.guess +config.h +config.h.in +config.log +config-ml.in +config.py +config.status +config.status.lineno +config.sub +configure +configure.scan +depcomp +.deps/ +INSTALL +install-sh +.libs/ +libtool +libtool.m4 +ltmain.sh +lt~obsolete.m4 +ltoptions.m4 +ltsugar.m4 +ltversion.m4 +Makefile +Makefile.in +mdate-sh +missing +mkinstalldirs +*.pc +py-compile +stamp-h? +symlink-tree +texinfo.tex +ylwrap + +# Do not edit the following section +# Edit Compile Debug Document Distribute +*~ +*.[0-9] +*.[0-9]x +*.bak +*.bin +core +*.dll +*.exe +*-ISO*.bdf +*-JIS*.bdf +*-KOI8*.bdf +*.kld +*.ko +*.ko.cmd +*.lai +*.l[oa] +*.[oa] +*.obj +*.patch +*.so +*.pcf.gz +*.pdb +*.tar.bz2 +*.tar.gz +# +# Add & Override patterns for libXdamage +# +# Edit the following section as needed +# For example, !report.pc overrides *.pc. See 'man gitignore' +# diff --git a/Makefile.am b/Makefile.am index 0e317a5..b107025 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,6 @@ -# +# # Copyright © 2003 Keith Packard, Noah Levitt -# +# # Permission to use, copy, modify, distribute, and sell this software and its # documentation for any purpose is hereby granted without fee, provided that # the above copyright notice appear in all copies and that both that @@ -10,7 +10,7 @@ # specific, written prior permission. Keith Packard makes no # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. -# +# # KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO # EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR diff --git a/autogen.sh b/autogen.sh new file mode 100755 index 0000000..904cd67 --- /dev/null +++ b/autogen.sh @@ -0,0 +1,12 @@ +#! /bin/sh + +srcdir=`dirname $0` +test -z "$srcdir" && srcdir=. + +ORIGDIR=`pwd` +cd $srcdir + +autoreconf -v --install || exit 1 +cd $ORIGDIR || exit $? + +$srcdir/configure --enable-maintainer-mode "$@" diff --git a/configure.ac b/configure.ac index 9382ec5..efe40ef 100644 --- a/configure.ac +++ b/configure.ac @@ -1,62 +1,61 @@ -dnl -dnl Copyright © 2003 Keith Packard, Noah Levitt -dnl -dnl Permission to use, copy, modify, distribute, and sell this software and its -dnl documentation for any purpose is hereby granted without fee, provided that -dnl the above copyright notice appear in all copies and that both that -dnl copyright notice and this permission notice appear in supporting -dnl documentation, and that the name of Keith Packard not be used in -dnl advertising or publicity pertaining to distribution of the software without -dnl specific, written prior permission. Keith Packard makes no -dnl representations about the suitability of this software for any purpose. It -dnl is provided "as is" without express or implied warranty. -dnl -dnl KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, -dnl INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -dnl EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR -dnl CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, -dnl DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER -dnl TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR -dnl PERFORMANCE OF THIS SOFTWARE. -dnl -dnl Process this file with autoconf to create configure. - +# +# Copyright © 2003 Keith Packard, Noah Levitt +# +# Permission to use, copy, modify, distribute, and sell this software and its +# documentation for any purpose is hereby granted 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 Keith Packard not be used in +# advertising or publicity pertaining to distribution of the software without +# specific, written prior permission. Keith Packard makes no +# representations about the suitability of this software for any purpose. It +# is provided "as is" without express or implied warranty. +# +# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO +# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +# DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER +# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +# PERFORMANCE OF THIS SOFTWARE. +# + +# Initialize Autoconf AC_PREREQ([2.60]) - -dnl -dnl Version should match the current XDamage version. XDamageQueryVersion -dnl returns the version from damagewire.h, NOT the version we set here. But we -dnl try to keep these the same. Note that the library has an extra -dnl digit in the version number to track changes which don't affect the -dnl protocol, so Xdamage version l.n.m corresponds to protocol version l.n -dnl -AC_INIT(libXdamage, - 1.1.3, - [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], - libXdamage) +# +# Version should match the current XDamage version. XDamageQueryVersion +# returns the version from damagewire.h, NOT the version we set here. But we +# try to keep these the same. Note that the library has an extra +# digit in the version number to track changes which don't affect the +# protocol, so Xdamage version l.n.m corresponds to protocol version l.n +# +AC_INIT(libXdamage, [1.1.4], + [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libXdamage]) +AC_CONFIG_SRCDIR([Makefile.am]) +AC_CONFIG_HEADERS([config.h]) + +# Initialize Automake AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE -# Require xorg-macros: XORG_DEFAULT_OPTIONS +# Initialize libtool +AC_PROG_LIBTOOL + +# Require X.Org macros 1.8 or later m4_ifndef([XORG_MACROS_VERSION], - [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])]) -XORG_MACROS_VERSION(1.3) + [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.8) XORG_DEFAULT_OPTIONS -AM_CONFIG_HEADER(config.h) - -# Check for progs -AC_PROG_CC -AC_PROG_LIBTOOL # Check damageext configuration, strip extra digits from package version to # find the required protocol version - DAMAGEEXT_VERSION=[`echo $VERSION | sed 's/^\([0-9][0-9]*\.[0-9][0-9]*\).*$/\1/'`] AC_SUBST(DAMAGEEXT_VERSION) -PKG_CHECK_MODULES(XDAMAGE, [damageproto >= $DAMAGEEXT_VERSION] xfixes fixesproto xextproto x11) -AC_SUBST(XDAMAGE_CFLAGS) -AC_OUTPUT([Makefile - src/Makefile - xdamage.pc]) +# Obtain compiler/linker options for depedencies +PKG_CHECK_MODULES(XDAMAGE, [damageproto >= $DAMAGEEXT_VERSION] xfixes fixesproto xextproto x11) +AC_CONFIG_FILES([Makefile + src/Makefile + xdamage.pc]) +AC_OUTPUT diff --git a/include/X11/extensions/Xdamage.h b/include/X11/extensions/Xdamage.h index 5ecf035..b3a5a06 100644 --- a/include/X11/extensions/Xdamage.h +++ b/include/X11/extensions/Xdamage.h @@ -62,7 +62,7 @@ void XDamageDestroy (Display *dpy, Damage damage); void -XDamageSubtract (Display *dpy, Damage damage, +XDamageSubtract (Display *dpy, Damage damage, XserverRegion repair, XserverRegion parts); void diff --git a/packaging/baselibs.conf b/packaging/baselibs.conf new file mode 100644 index 0000000..37b6fb9 --- /dev/null +++ b/packaging/baselibs.conf @@ -0,0 +1 @@ +libXdamage diff --git a/packaging/libXdamage.changes b/packaging/libXdamage.changes new file mode 100644 index 0000000..7bae94e --- /dev/null +++ b/packaging/libXdamage.changes @@ -0,0 +1,6 @@ +* Mon Mar 18 2013 Anas Nashif submit/trunk/20130204.203359@9de1872 +- Fixed package groups + +* Mon Feb 04 2013 Anas Nashif upstream/1.1.3@4f26cf5 +- Add multi-lib support + diff --git a/packaging/libXdamage.manifest b/packaging/libXdamage.manifest new file mode 100644 index 0000000..017d22d --- /dev/null +++ b/packaging/libXdamage.manifest @@ -0,0 +1,5 @@ + + + + + diff --git a/packaging/libXdamage.spec b/packaging/libXdamage.spec index a677410..8a19aed 100644 --- a/packaging/libXdamage.spec +++ b/packaging/libXdamage.spec @@ -1,6 +1,6 @@ Summary: X Damage extension library Name: libXdamage -Version: 1.1.3 +Version: 1.1.4 Release: 3 License: MIT Group: System Environment/Libraries @@ -61,4 +61,4 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root,-) %{_includedir}/X11/extensions/Xdamage.h %{_libdir}/libXdamage.so -%{_libdir}/pkgconfig/xdamage.pc +%{_libdir}/pkgconfig/xdamage.pc \ No newline at end of file diff --git a/src/Makefile.am b/src/Makefile.am index 787fc04..0027895 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -12,4 +12,4 @@ INCLUDES = -I$(top_srcdir)/include/X11/extensions libXdamage_la_LDFLAGS = -version-number 1:1:0 -no-undefined libXdamageincludedir = $(includedir)/X11/extensions -libXdamageinclude_HEADERS = $(top_srcdir)/include/X11/extensions/Xdamage.h +libXdamageinclude_HEADERS = $(top_srcdir)/include/X11/extensions/Xdamage.h diff --git a/src/Xdamage.c b/src/Xdamage.c index 3a368d2..dc0044d 100644 --- a/src/Xdamage.c +++ b/src/Xdamage.c @@ -32,7 +32,7 @@ const char XDamageExtensionName[] = DAMAGE_NAME; static int XDamageCloseDisplay (Display *dpy, XExtCodes *codes); - + static Bool XDamageWireToEvent(Display *dpy, XEvent *event, xEvent *wire); @@ -58,13 +58,13 @@ XDamageExtAddDisplay (XDamageExtInfo *extinfo, info->codes = XInitExtension (dpy, ext_name); /* - * if the server has the extension, then we can initialize the + * if the server has the extension, then we can initialize the * appropriate function vectors */ if (info->codes) { xDamageQueryVersionReply rep; xDamageQueryVersionReq *req; - XESetCloseDisplay (dpy, info->codes->extension, + XESetCloseDisplay (dpy, info->codes->extension, XDamageCloseDisplay); for (ev = info->codes->first_event; ev < info->codes->first_event + XDamageNumberEvents; @@ -82,7 +82,7 @@ XDamageExtAddDisplay (XDamageExtInfo *extinfo, req->damageReqType = X_DamageQueryVersion; req->majorVersion = DAMAGE_MAJOR; req->minorVersion = DAMAGE_MINOR; - if (!_XReply (dpy, (xReply *) &rep, 0, xTrue)) + if (!_XReply (dpy, (xReply *) &rep, 0, xTrue)) { UnlockDisplay (dpy); SyncHandle (); @@ -124,7 +124,7 @@ XDamageExtAddDisplay (XDamageExtInfo *extinfo, * XDamageExtRemoveDisplay - remove the indicated display from the * extension object. (Replaces XextRemoveDisplay.) */ -static int +static int XDamageExtRemoveDisplay (XDamageExtInfo *extinfo, Display *dpy) { XDamageExtDisplayInfo *info, *prev; @@ -165,7 +165,7 @@ XDamageExtRemoveDisplay (XDamageExtInfo *extinfo, Display *dpy) * XextFindDisplay.) */ static XDamageExtDisplayInfo * -XDamageExtFindDisplay (XDamageExtInfo *extinfo, +XDamageExtFindDisplay (XDamageExtInfo *extinfo, Display *dpy) { XDamageExtDisplayInfo *info; @@ -173,7 +173,7 @@ XDamageExtFindDisplay (XDamageExtInfo *extinfo, /* * see if this was the most recently accessed display */ - if ((info = extinfo->cur) && info->display == dpy) + if ((info = extinfo->cur) && info->display == dpy) return info; /* @@ -199,11 +199,11 @@ XDamageFindDisplay (Display *dpy) info = XDamageExtFindDisplay (&XDamageExtensionInfo, dpy); if (!info) - info = XDamageExtAddDisplay (&XDamageExtensionInfo, dpy, + info = XDamageExtAddDisplay (&XDamageExtensionInfo, dpy, XDamageExtensionName); return info; } - + static int XDamageCloseDisplay (Display *dpy, XExtCodes *codes) { @@ -280,24 +280,24 @@ XDamageEventToWire(Display *dpy, XEvent *event, xEvent *wire) return False; } -Bool +Bool XDamageQueryExtension (Display *dpy, int *event_base_return, int *error_base_return) { XDamageExtDisplayInfo *info = XDamageFindDisplay (dpy); - if (XDamageHasExtension(info)) + if (XDamageHasExtension(info)) { *event_base_return = info->codes->first_event; *error_base_return = info->codes->first_error; return True; - } + } else return False; } -Status +Status XDamageQueryVersion (Display *dpy, int *major_version_return, int *minor_version_return) @@ -348,7 +348,7 @@ XDamageDestroy (Display *dpy, Damage damage) } void -XDamageSubtract (Display *dpy, Damage damage, +XDamageSubtract (Display *dpy, Damage damage, XserverRegion repair, XserverRegion parts) { XDamageExtDisplayInfo *info = XDamageFindDisplay (dpy); diff --git a/src/xdamageint.h b/src/xdamageint.h index 6430a41..f833714 100644 --- a/src/xdamageint.h +++ b/src/xdamageint.h @@ -23,8 +23,6 @@ #ifndef _XDAMAGEINT_H_ #define _XDAMAGEINT_H_ -#define NEED_EVENTS -#define NEED_REPLIES #include #include #include -- 2.7.4