Merge remote-tracking branch 'x/master'
* x/master: xf86-video-ati: update to 6.14.4. libdrm: update to 2.4.33. yelp: links to libgmodule-2.0. notification-daemon: links to libpthread due to glib-2.32. nautilus: links in additional SONAMEs. metacity: links to libgmodule-2.0. gnome-themes-standard: add missing SONAMEs. gnome-panel: add missing SONAME. gnome: require stable gnome-icon-theme.
This commit is contained in:
davehome
commit
2e437af7aa
18 changed files with 26 additions and 133 deletions
|
|
@ -31,3 +31,4 @@ libXau.so.6
|
|||
libecal-1.2.so.11
|
||||
libedataserver-1.2.so.16
|
||||
libpolkit-gobject-1.so.0
|
||||
librt.so.1
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
# Template file for 'gnome-panel'
|
||||
pkgname=gnome-panel
|
||||
version=3.4.0
|
||||
revision=1
|
||||
distfiles="${GNOME_SITE}/$pkgname/3.4/$pkgname-$version.tar.xz"
|
||||
build_style=gnu-configure
|
||||
configure_args="--disable-schemas-install --disable-scrollkeeper
|
||||
|
|
|
|||
|
|
@ -12,3 +12,6 @@ libcairo.so.2
|
|||
libgobject-2.0.so.0
|
||||
libglib-2.0.so.0
|
||||
libc.so.6
|
||||
libgmodule-2.0.so.0
|
||||
librt.so.1
|
||||
libpthread.so.0
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
# Template build file for 'gnome-themes-standard'.
|
||||
pkgname=gnome-themes-standard
|
||||
version=3.4.0
|
||||
revision=1
|
||||
distfiles="${GNOME_SITE}/$pkgname/3.4/$pkgname-$version.tar.xz"
|
||||
build_style=gnu-configure
|
||||
short_desc="Standard gnome themes"
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
# Template file for 'gnome'
|
||||
pkgname=gnome
|
||||
version=3.4.0
|
||||
revision=1
|
||||
revision=2
|
||||
build_style=meta-template
|
||||
short_desc="GNOME meta-package"
|
||||
maintainer="Juan RP <xtraeme@gmail.com>"
|
||||
|
|
@ -15,7 +15,7 @@ Add_dependency run gnome-backgrounds ">=${version}"
|
|||
Add_dependency run gnome-themes-standard ">=${version}"
|
||||
Add_dependency run gnome-control-center ">=${version}"
|
||||
Add_dependency run gnome-desktop ">=${version}"
|
||||
Add_dependency run gnome-icon-theme ">=3.3.91"
|
||||
Add_dependency run gnome-icon-theme ">=${version}"
|
||||
Add_dependency run gnome-icon-theme-extras ">=${version}"
|
||||
Add_dependency run gnome-icon-theme-symbolic ">=${version}"
|
||||
Add_dependency run gnome-panel ">=${version}"
|
||||
|
|
|
|||
|
|
@ -5,9 +5,8 @@ long_desc="${long_desc}
|
|||
|
||||
This package contains files for development, headers, static libs, etc."
|
||||
|
||||
Add_dependency run glibc-devel
|
||||
Add_dependency run libudev-devel
|
||||
Add_dependency run libdrm
|
||||
Add_dependency run libdrm ">=${version}"
|
||||
|
||||
do_install()
|
||||
{
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
# Template build file for 'libdrm'.
|
||||
pkgname=libdrm
|
||||
version=2.4.32
|
||||
version=2.4.33
|
||||
distfiles="http://dri.freedesktop.org/libdrm/$pkgname-$version.tar.bz2"
|
||||
build_style=gnu-configure
|
||||
configure_args="--enable-udev --enable-vmwgfx-experimental-api
|
||||
|
|
@ -9,7 +9,7 @@ short_desc="Userspace interface to kernel DRM services"
|
|||
maintainer="Juan RP <xtraeme@gmail.com>"
|
||||
homepage="http://dri.freedesktop.org/"
|
||||
license="MIT"
|
||||
checksum=9ba8a1613de57af8f501a162747ed69aff30d63fc1316602770974bdd9ee984e
|
||||
checksum=2d7b9d94ada0e3a6ede6243509883df2ded01c2983e24322759a366283898fea
|
||||
long_desc="
|
||||
This package provides a library which offers a userspace interface
|
||||
to kernel DRM (Direct Rendering Manager) services for access to
|
||||
|
|
|
|||
|
|
@ -31,3 +31,4 @@ libpangoft2-1.0.so.0
|
|||
libfreetype.so.6
|
||||
libfontconfig.so.1
|
||||
librt.so.1
|
||||
libgmodule-2.0.so.0
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
# Template file for 'metacity'
|
||||
pkgname=metacity
|
||||
version=2.34.3
|
||||
revision=1
|
||||
distfiles="${GNOME_SITE}/$pkgname/2.34/$pkgname-$version.tar.xz"
|
||||
build_style=gnu-configure
|
||||
configure_args="--disable-static --disable-schemas-compile --disable-scrollkeeper"
|
||||
|
|
|
|||
|
|
@ -11,3 +11,6 @@ libgobject-2.0.so.0
|
|||
libglib-2.0.so.0
|
||||
libm.so.6
|
||||
libc.so.6
|
||||
libgmodule-2.0.so.0
|
||||
librt.so.1
|
||||
libpthread.so.0
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@ long_desc="${long_desc}
|
|||
|
||||
This package contains the shared libraries."
|
||||
|
||||
revision=1
|
||||
replaces="nautilus<3.2.1"
|
||||
|
||||
do_install() {
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
# Template file for 'nautilus'
|
||||
pkgname=nautilus
|
||||
version=3.4.0
|
||||
revision=1
|
||||
distfiles="${GNOME_SITE}/$pkgname/3.4/$pkgname-$version.tar.xz"
|
||||
build_style=gnu-configure
|
||||
configure_args="--disable-update-mimedb --disable-tracker
|
||||
|
|
|
|||
|
|
@ -9,3 +9,4 @@ libgobject-2.0.so.0
|
|||
libglib-2.0.so.0
|
||||
libX11.so.6
|
||||
libc.so.6
|
||||
libpthread.so.0
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
# Template file for 'notification-daemon'
|
||||
pkgname=notification-daemon
|
||||
version=0.7.4
|
||||
revision=1
|
||||
distfiles="${GNOME_SITE}/$pkgname/0.7/$pkgname-$version.tar.xz"
|
||||
build_style=gnu-configure
|
||||
configure_args="--disable-static"
|
||||
|
|
@ -17,6 +18,7 @@ conflicts="xfce4-notifyd>=0"
|
|||
|
||||
Add_dependency build pkg-config
|
||||
Add_dependency build intltool
|
||||
Add_dependency build glib-devel
|
||||
Add_dependency build gtk+3-devel
|
||||
Add_dependency build libcanberra-devel
|
||||
|
||||
|
|
|
|||
|
|
@ -1,118 +0,0 @@
|
|||
From c66ae235700f5efe64eb168327551b8f1d153c9c Mon Sep 17 00:00:00 2001
|
||||
From: Michel Dänzer <michel.daenzer@amd.com>
|
||||
Date: Mon, 13 Feb 2012 09:43:58 +0000
|
||||
Subject: Handle new xorg_list API.
|
||||
|
||||
Fixes https://bugs.freedesktop.org/show_bug.cgi?id=45937
|
||||
|
||||
Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
|
||||
---
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 29f129a..0083325 100644
|
||||
--- configure.ac
|
||||
+++ configure.ac
|
||||
@@ -234,10 +234,18 @@ AC_CHECK_DECL(XSERVER_LIBPCIACCESS,
|
||||
[#include "xorg-server.h"])
|
||||
|
||||
AC_CHECK_HEADERS([list.h],
|
||||
- [], [],
|
||||
+ [have_list_h="yes"], [have_list_h="no"],
|
||||
[#include <X11/Xdefs.h>
|
||||
#include "xorg-server.h"])
|
||||
|
||||
+if test "x$have_list_h" = xyes; then
|
||||
+ AC_CHECK_DECL(xorg_list_init,
|
||||
+ [AC_DEFINE(HAVE_XORG_LIST, 1, [Have xorg_list API])], [],
|
||||
+ [#include <X11/Xdefs.h>
|
||||
+ #include "xorg-server.h"
|
||||
+ #include "list.h"])
|
||||
+fi
|
||||
+
|
||||
CPPFLAGS="$SAVE_CPPFLAGS"
|
||||
|
||||
AM_CONDITIONAL(USE_EXA, test "x$USE_EXA" = xyes)
|
||||
diff --git a/src/radeon_dri2.c b/src/radeon_dri2.c
|
||||
index 835575f..cf905a1 100644
|
||||
--- src/radeon_dri2.c
|
||||
+++ src/radeon_dri2.c
|
||||
@@ -40,6 +40,13 @@
|
||||
|
||||
#if HAVE_LIST_H
|
||||
#include "list.h"
|
||||
+#if !HAVE_XORG_LIST
|
||||
+#define xorg_list list
|
||||
+#define xorg_list_init list_init
|
||||
+#define xorg_list_add list_add
|
||||
+#define xorg_list_del list_del
|
||||
+#define xorg_list_for_each_entry list_for_each_entry
|
||||
+#endif
|
||||
#endif
|
||||
|
||||
#ifdef RADEON_DRI2
|
||||
@@ -515,11 +522,11 @@ typedef struct _DRI2FrameEvent {
|
||||
|
||||
Bool valid;
|
||||
|
||||
- struct list link;
|
||||
+ struct xorg_list link;
|
||||
} DRI2FrameEventRec, *DRI2FrameEventPtr;
|
||||
|
||||
typedef struct _DRI2ClientEvents {
|
||||
- struct list reference_list;
|
||||
+ struct xorg_list reference_list;
|
||||
} DRI2ClientEventsRec, *DRI2ClientEventsPtr;
|
||||
|
||||
#if HAS_DEVPRIVATEKEYREC
|
||||
@@ -538,7 +545,7 @@ DevPrivateKey DRI2ClientEventsPrivateKey = &DRI2ClientEventsPrivateKeyIndex;
|
||||
dixLookupPrivate(&(pClient)->devPrivates, DRI2ClientEventsPrivateKey))
|
||||
|
||||
static int
|
||||
-ListAddDRI2ClientEvents(ClientPtr client, struct list *entry)
|
||||
+ListAddDRI2ClientEvents(ClientPtr client, struct xorg_list *entry)
|
||||
{
|
||||
DRI2ClientEventsPtr pClientPriv;
|
||||
pClientPriv = GetDRI2ClientEvents(client);
|
||||
@@ -547,12 +554,12 @@ ListAddDRI2ClientEvents(ClientPtr client, struct list *entry)
|
||||
return BadAlloc;
|
||||
}
|
||||
|
||||
- list_add(entry, &pClientPriv->reference_list);
|
||||
+ xorg_list_add(entry, &pClientPriv->reference_list);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void
|
||||
-ListDelDRI2ClientEvents(ClientPtr client, struct list *entry)
|
||||
+ListDelDRI2ClientEvents(ClientPtr client, struct xorg_list *entry)
|
||||
{
|
||||
DRI2ClientEventsPtr pClientPriv;
|
||||
pClientPriv = GetDRI2ClientEvents(client);
|
||||
@@ -560,7 +567,7 @@ ListDelDRI2ClientEvents(ClientPtr client, struct list *entry)
|
||||
if (!pClientPriv) {
|
||||
return;
|
||||
}
|
||||
- list_del(entry);
|
||||
+ xorg_list_del(entry);
|
||||
}
|
||||
|
||||
static void
|
||||
@@ -574,7 +581,7 @@ radeon_dri2_client_state_changed(CallbackListPtr *ClientStateCallback, pointer d
|
||||
|
||||
switch (pClient->clientState) {
|
||||
case ClientStateInitial:
|
||||
- list_init(&pClientEventsPriv->reference_list);
|
||||
+ xorg_list_init(&pClientEventsPriv->reference_list);
|
||||
break;
|
||||
case ClientStateRunning:
|
||||
break;
|
||||
@@ -582,7 +589,7 @@ radeon_dri2_client_state_changed(CallbackListPtr *ClientStateCallback, pointer d
|
||||
case ClientStateRetained:
|
||||
case ClientStateGone:
|
||||
if (pClientEventsPriv) {
|
||||
- list_for_each_entry(ref, &pClientEventsPriv->reference_list, link) {
|
||||
+ xorg_list_for_each_entry(ref, &pClientEventsPriv->reference_list, link) {
|
||||
ref->valid = FALSE;
|
||||
}
|
||||
}
|
||||
--
|
||||
cgit v0.9.0.2-2-gbebe
|
||||
|
|
@ -1,12 +1,11 @@
|
|||
# Template build file for 'xf86-video-ati'.
|
||||
pkgname=xf86-video-ati
|
||||
version=6.14.3
|
||||
version=6.14.4
|
||||
distfiles="${XORG_SITE}/driver/$pkgname-$version.tar.bz2"
|
||||
build_style=gnu-configure
|
||||
revision=2
|
||||
short_desc="Xorg ATI Radeon video driver"
|
||||
maintainer="Juan RP <xtraeme@gmail.com>"
|
||||
checksum=844a2649eff6a3e92aff3e1837ea864f1561b4822b3e5d5ccb27b3b7fb8137b4
|
||||
checksum=4ffe435ef8fbe0989f6576f04f789e147a2de7fdefc3644e39d5ef626c37ef85
|
||||
long_desc="
|
||||
This is the video driver for ATI Radeon cards for the Xorg X11 server."
|
||||
|
||||
|
|
@ -14,8 +13,6 @@ replaces="${pkgname}>=0"
|
|||
|
||||
Add_dependency run xorg-server
|
||||
|
||||
Add_dependency build automake
|
||||
Add_dependency build xorg-util-macros
|
||||
Add_dependency build pkg-config
|
||||
Add_dependency build xf86driproto
|
||||
Add_dependency build libudev-devel
|
||||
|
|
@ -24,7 +21,3 @@ Add_dependency build libdrm-devel
|
|||
Add_dependency build pixman-devel
|
||||
Add_dependency build xorg-server-devel
|
||||
Add_dependency build MesaLib-devel
|
||||
|
||||
pre_configure() {
|
||||
autoreconf -fi
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
# Template file for 'yelp'
|
||||
pkgname=yelp
|
||||
version=3.4.0
|
||||
revision=1
|
||||
distfiles="${GNOME_SITE}/$pkgname/3.4/$pkgname-$version.tar.xz"
|
||||
build_style=gnu-configure
|
||||
configure_args="--disable-schemas-compile --disable-static"
|
||||
|
|
|
|||
|
|
@ -24,3 +24,5 @@ libglib-2.0.so.0
|
|||
libpthread.so.0
|
||||
libc.so.6
|
||||
libjavascriptcoregtk-3.0.so.0
|
||||
libgmodule-2.0.so.0
|
||||
librt.so.1
|
||||
|
|
|
|||
Loading…
Reference in a new issue