jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse source
This commit is contained in:
wertyi48 2013-07-05 16:04:54 -03:00
commit 9c500ef185
34 changed files with 406 additions and 226 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
srcpkgs/gtk+/template
View file

@ -1,6 +1,6 @@
# Template build file for 'gtk+'.
pkgname=gtk+
version=2.24.19
version=2.24.20
revision=1
build_style=gnu-configure
configure_args="--enable-cups --with-xinput"
@ -9,7 +9,7 @@ maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.gtk.org"
license="LGPL-2.1"
distfiles="${GNOME_SITE}/gtk+/2.24/gtk+-$version.tar.xz"
checksum=15b8bf463eba99abfa58270662914e8e9b83568ab4945b5f0ef1aa29e90becb8
checksum=cc66bcbf9239a7d9861175c681ba95894b55c70dc0b37aad8345c46ecfda0da3
hostmakedepends="pkg-config perl"
makedepends="shared-mime-info glib-devel libXcursor-devel
@ -49,6 +49,7 @@ gtk+-devel_package() {
pkg_install() {
vmove usr/include
vmove usr/lib/pkgconfig
vmove "usr/lib/*.so"
vmove usr/lib/gtk-2.0/include
if [ "$build_option_gir" ]; then
vmove usr/share/gir-1.0

4
srcpkgs/libudev/template
View file

@ -1,14 +1,14 @@
# Template file for 'libudev'
pkgname=libudev
version=205
revision=1
revision=2
wrksrc="systemd-${version}"
build_style=gnu-configure
configure_args="--libexecdir=/usr/lib --disable-selinux
--disable-static --disable-ima --enable-introspection=no
--disable-kmod --disable-blkid --disable-chkconfig
--disable-selinux --disable-tcpwrap --disable-pam
--disable-acl --disable-xattr --disable-audit
--disable-acl --disable-xattr --disable-audit --disable-machined
--disable-libcryptsetup --disable-qrencode --disable-microhttpd
--disable-binfmt --disable-vconsole --disable-readahead --disable-bootchart
--disable-quotacheck --disable-randomseed --disable-hostnamed

68
srcpkgs/systemd/patches/ad929bcc27e2c6c1aa731053e45882686e9babab.patch Normal file
View file

@ -0,0 +1,68 @@
From ad929bcc27e2c6c1aa731053e45882686e9babab Mon Sep 17 00:00:00 2001
From: Kay Sievers <kay@vrfy.org>
Date: Thu, 04 Jul 2013 18:31:18 +0000
Subject: disable the cgroups release agent when shutting down
During shutdown, when we try to clean up all remaining processes, the
kernel will fork new agents every time a cgroup runs empty. These
new processes cause delays in the final SIGTERM, SIGKILL logic.
Apart from that, this should also avoid that the kernel-forked binaries
cause unpredictably timed access to the filesystem which we might need to
unmount.
---
diff --git a/src/core/main.c b/src/core/main.c
index 8b8e110..ada0f9d 100644
--- src/core/main.c
+++ src/core/main.c
@@ -1942,6 +1942,10 @@ finish:
watchdog_close(true);
}
+ /* avoid the creation of new processes forked by the kernel; at this
+ * point, we will not listen to the signals anyway */
+ cg_uninstall_release_agent(SYSTEMD_CGROUP_CONTROLLER);
+
execve(SYSTEMD_SHUTDOWN_BINARY_PATH, (char **) command_line, env_block);
free(env_block);
log_error("Failed to execute shutdown binary, freezing: %m");
diff --git a/src/shared/cgroup-util.c b/src/shared/cgroup-util.c
index 390259e..73013d1 100644
--- src/shared/cgroup-util.c
+++ src/shared/cgroup-util.c
@@ -790,6 +790,21 @@ int cg_install_release_agent(const char *controller, const char *agent) {
return 0;
}
+int cg_uninstall_release_agent(const char *controller) {
+ _cleanup_free_ char *fs = NULL;
+ int r;
+
+ r = cg_get_path(controller, NULL, "release_agent", &fs);
+ if (r < 0)
+ return r;
+
+ r = write_string_file(fs, "");
+ if (r < 0)
+ return r;
+
+ return 0;
+}
+
int cg_is_empty(const char *controller, const char *path, bool ignore_self) {
_cleanup_fclose_ FILE *f = NULL;
pid_t pid = 0, self_pid;
diff --git a/src/shared/cgroup-util.h b/src/shared/cgroup-util.h
index c781aab..0fc93c1 100644
--- src/shared/cgroup-util.h
+++ src/shared/cgroup-util.h
@@ -89,6 +89,7 @@ int cg_set_group_access(const char *controller, const char *path, mode_t mode, u
int cg_set_task_access(const char *controller, const char *path, mode_t mode, uid_t uid, gid_t gid);
int cg_install_release_agent(const char *controller, const char *agent);
+int cg_uninstall_release_agent(const char *controller);
int cg_is_empty(const char *controller, const char *path, bool ignore_self);
int cg_is_empty_by_spec(const char *spec, bool ignore_self);
--
cgit v0.9.0.2-2-gbebe

48
srcpkgs/systemd/patches/c1eba3008cac9e625b8bb774e9b44ceec8465980.patch Normal file
View file

@ -0,0 +1,48 @@
From c1eba3008cac9e625b8bb774e9b44ceec8465980 Mon Sep 17 00:00:00 2001
From: Kay Sievers <kay@vrfy.org>
Date: Thu, 04 Jul 2013 18:54:40 +0000
Subject: cgroups-agent: remove ancient fallback code; turn connection error into warning
During re-execution and shutdown cgroups agents might not be able
to connect to systemd's private D-Bus socket, the printed error to
the console is misleding in that case, so turn it into a warning.
---
diff --git a/src/cgroups-agent/cgroups-agent.c b/src/cgroups-agent/cgroups-agent.c
index 0e3d2b7..a47949a 100644
--- src/cgroups-agent/cgroups-agent.c
+++ src/cgroups-agent/cgroups-agent.c
@@ -48,26 +48,19 @@ int main(int argc, char *argv[]) {
* this to avoid an activation loop when we start dbus when we
* are called when the dbus service is shut down. */
- if (!(bus = dbus_connection_open_private("unix:path=/run/systemd/private", &error))) {
-#ifndef NOLEGACY
- dbus_error_free(&error);
-
- /* Retry with the pre v21 socket name, to ease upgrades */
- if (!(bus = dbus_connection_open_private("unix:abstract=/org/freedesktop/systemd1/private", &error))) {
-#endif
- log_error("Failed to get D-Bus connection: %s", bus_error_message(&error));
- goto finish;
- }
-#ifndef NOLEGACY
+ bus = dbus_connection_open_private("unix:path=/run/systemd/private", &error);
+ if (!bus) {
+ log_warning("Failed to get D-Bus connection: %s", bus_error_message(&error));
+ goto finish;
}
-#endif
if (bus_check_peercred(bus) < 0) {
log_error("Bus owner not root.");
goto finish;
}
- if (!(m = dbus_message_new_signal("/org/freedesktop/systemd1/agent", "org.freedesktop.systemd1.Agent", "Released"))) {
+ m = dbus_message_new_signal("/org/freedesktop/systemd1/agent", "org.freedesktop.systemd1.Agent", "Released");
+ if (!m) {
log_error("Could not allocate signal message.");
goto finish;
}
--
cgit v0.9.0.2-2-gbebe

2
srcpkgs/systemd/template
View file

@ -1,7 +1,7 @@
# Template file for 'systemd'
pkgname=systemd
version=205
revision=1
revision=2
short_desc="A system and service manager for Linux"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.freedesktop.org/wiki/Software/systemd"

4
srcpkgs/virtualbox-ose/template
View file

@ -1,6 +1,6 @@
# Template file for 'virtualbox-ose'
pkgname=virtualbox-ose
_vbox_distver=4.2.14
_vbox_distver=4.2.16
version=${_vbox_distver}
revision=1
wrksrc="VirtualBox-${version}"
@ -10,7 +10,7 @@ maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://virtualbox.org"
license="GPL-2, MPL-1.1, CDDL"
distfiles="http://download.virtualbox.org/virtualbox/$version/VirtualBox-$version.tar.bz2"
checksum=f8f6dc19612f3c84a5c857b8e5c452b8db2cf3c8c52a678b6a00e5dd5831130d
checksum=ff0f8916d039120554d9d73c7cae1863d6161933374374ec2f5313892046d45a
only_for_archs="i686 x86_64"

4
srcpkgs/xbps-git/template
View file

@ -1,7 +1,7 @@
# Template file for 'xbps-git'
pkgname=xbps-git
version=20130704
revision=3
version=20130705
revision=2
build_style=configure
configure_args="--prefix=/usr --sysconfdir=/etc --enable-static --enable-debug --enable-tests"
short_desc="The XBPS package system (development branch)"

10
srcpkgs/xbps-src-utils/template
View file

@ -1,10 +1,10 @@
# Template build file for 'xbps-src-utils'.
pkgname=xbps-src-utils
version=20130321
version=20130705
revision=1
homepage="https://github.com/davehome/xbps-src-utils"
hostmakedepends="pkg-config flex"
makedepends="libxbps-devel>=0.21"
makedepends="libxbps-devel>=0.25"
short_desc="Various tools for xbps-src in C (like repo-checkvers)"
maintainer="davehome <davehome@redthumb.info.tm>"
license="Simplified BSD"
@ -30,10 +30,7 @@ do_fetch() {
}
do_configure() {
if [ "$CROSS_BUILD" ]; then
_pcenv="env PKG_CONFIG_LIBDIR=/usr/$XBPS_CROSS_TRIPLET/lib/pkgconfig"
fi
${_pcenv} ./configure --prefix=/usr --etcdir=/etc
./configure --prefix=/usr --etcdir=/etc
}
do_build() {
@ -45,7 +42,6 @@ do_install() {
}
xbps-src-utils_package() {
depends="libxbps>=0.21"
pkg_install() {
vmove usr
}

64
srcpkgs/xbps/patches/0001-Check-if-an-update-for-conflicting-pkg-is-in-the-tra.patch Normal file
View file

@ -0,0 +1,64 @@
From ecd15b7d57e1d271aa95581e97f1a6b11cd57235 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Fri, 5 Jul 2013 10:09:32 +0200
Subject: [PATCH] Check if an update for conflicting pkg is in the transaction
for revdeps in vpkgs.
---
NEWS | 3 +++
lib/transaction_revdeps.c | 21 +++++++++++++++++++--
2 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/lib/transaction_revdeps.c b/lib/transaction_revdeps.c
index 316d937..b21c5b5 100644
--- lib/transaction_revdeps.c
+++ lib/transaction_revdeps.c
@@ -45,12 +45,13 @@ check_virtual_pkgs(struct xbps_handle *xhp,
xbps_dictionary_t trans_pkgd,
xbps_dictionary_t rev_pkgd)
{
- xbps_array_t provides, rundeps, mdeps;
+ xbps_array_t unsorted, provides, rundeps, mdeps;
const char *pkgver, *revpkgver, *pkgpattern;
- char *pkgname, *vpkgname, *vpkgver, *str;
+ char *pkgname, *pkgdepname, *vpkgname, *vpkgver, *str;
unsigned int i, x;
bool matched = false;
+ unsorted = xbps_dictionary_get(xhp->transd, "unsorted_deps");
provides = xbps_dictionary_get(trans_pkgd, "provides");
for (i = 0; i < xbps_array_count(provides); i++) {
char *tmp = NULL;
@@ -77,6 +78,21 @@ check_virtual_pkgs(struct xbps_handle *xhp,
if (xbps_pkgpattern_match(vpkgver, pkgpattern))
continue;
+ /*
+ * Installed package conflicts with package
+ * in transaction being updated, check
+ * if a new version of this conflicting package
+ * is in the transaction.
+ */
+ xbps_dictionary_get_cstring_nocopy(trans_pkgd, "pkgver", &pkgver);
+ pkgdepname = xbps_pkg_name(pkgver);
+ assert(pkgdepname);
+ if (xbps_find_pkg_in_array(unsorted, pkgdepname)) {
+ free(pkgdepname);
+ continue;
+ }
+ free(pkgdepname);
+
mdeps = xbps_dictionary_get(xhp->transd, "missing_deps");
xbps_dictionary_get_cstring_nocopy(trans_pkgd, "pkgver", &pkgver);
xbps_dictionary_get_cstring_nocopy(rev_pkgd, "pkgver", &revpkgver);
@@ -87,6 +103,7 @@ check_virtual_pkgs(struct xbps_handle *xhp,
free(str);
matched = true;
}
+ free(vpkgname);
free(vpkgver);
}
return matched;
--
1.8.3

26
srcpkgs/xbps/patches/0001-lib-package_unpack.c-remove-extra-arg-in-xbps_set_cb.patch
View file

@ -1,26 +0,0 @@
From 7da5f6e8f76a47e899df1fc0d0e58256bc0dbcd0 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Wed, 15 May 2013 12:45:35 +0200
Subject: [PATCH] lib/package_unpack.c: remove extra arg in
xbps_set_cb_state().
---
lib/package_unpack.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/package_unpack.c b/lib/package_unpack.c
index e1d0fc1..259b13c 100644
--- lib/package_unpack.c
+++ lib/package_unpack.c
@@ -452,7 +452,7 @@ unpack_archive(struct xbps_handle *xhp,
if (archive_read_extract(ar, entry, flags) != 0) {
rv = archive_errno(ar);
xbps_set_cb_state(xhp, XBPS_STATE_UNPACK_FAIL,
- rv, pkgver, NULL,
+ rv, pkgver,
"%s: [unpack] failed to extract file `%s': %s",
pkgver, entry_pname, strerror(rv));
} else {
--
1.8.2.2

27
srcpkgs/xbps/patches/0002-xbps-create-8-calculate-correctly-target-file-for-re.patch
View file

@ -1,27 +0,0 @@
From d6605e1b97fcec16169c788b9bd35d269134d1ca Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Mon, 27 May 2013 10:27:55 +0200
Subject: [PATCH] xbps-create(8): calculate correctly target file for relative
symlinks.
---
NEWS | 2 ++
bin/xbps-create/main.c | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/bin/xbps-create/main.c b/bin/xbps-create/main.c
index 9a6c2be..2a2373d 100644
--- bin/xbps-create/main.c
+++ bin/xbps-create/main.c
@@ -237,7 +237,7 @@ ftw_cb(const char *fpath, const struct stat *sb, int type, struct FTW *ftwbuf)
*/
xe->target = strdup(buf);
} else {
- xe->target = strdup(p + strlen(destdir));
+ xe->target = strdup(p + strlen(destdir) - 1);
free(p);
}
} else if (strchr(buf, '/') == NULL) {
--
1.8.3

44
srcpkgs/xbps/patches/0003-xbps-create-improve-d6605e1b97-sanitize-destdir-to-r.patch
View file

@ -1,44 +0,0 @@
From fa9d3471d921e1d49cdddeeab546d61f04bc1cf1 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Mon, 27 May 2013 13:03:40 +0200
Subject: [PATCH] xbps-create: improve d6605e1b97 (sanitize destdir to resolve
target files in symlinks).
Previously in d6605e1b97 if destdir had trailing '/' the behavior
of detecting target files in symlinks was changed slightly.
---
bin/xbps-create/main.c | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/bin/xbps-create/main.c b/bin/xbps-create/main.c
index 2a2373d..5d0a265 100644
--- bin/xbps-create/main.c
+++ bin/xbps-create/main.c
@@ -178,7 +178,7 @@ ftw_cb(const char *fpath, const struct stat *sb, int type, struct FTW *ftwbuf)
{
struct xentry *xe = NULL;
const char *filep = NULL;
- char *buf, *p, *dname;
+ char *buf, *p, *p2, *dname;
ssize_t r;
(void)ftwbuf;
@@ -237,7 +237,14 @@ ftw_cb(const char *fpath, const struct stat *sb, int type, struct FTW *ftwbuf)
*/
xe->target = strdup(buf);
} else {
- xe->target = strdup(p + strlen(destdir) - 1);
+ /*
+ * Sanitize destdir just in case.
+ */
+ if ((p2 = realpath(destdir, NULL)) == NULL)
+ die("failed to sanitize destdir %s: %s", destdir, strerror(errno));
+
+ xe->target = strdup(p+strlen(p2));
+ free(p2);
free(p);
}
} else if (strchr(buf, '/') == NULL) {
--
1.8.3

18
srcpkgs/xbps/template
View file

@ -1,36 +1,34 @@
# Template file for 'xbps'
pkgname=xbps
version=0.24
revision=4
version=0.25
revision=2
build_style=configure
configure_args="--prefix=/ --exec-prefix=/usr --sbindir=/usr/sbin
--enable-static --enable-debug --enable-tests"
configure_args="--prefix=/usr --sysconfdir=/etc --enable-static --enable-debug --enable-tests"
hostmakedepends="which pkg-config"
makedepends="zlib-devel proplib-devel>=0.6.3 openssl-devel
libfetch-devel libarchive-devel>=3.1.2 confuse-devel atf-devel"
makedepends="zlib-devel openssl-devel libarchive-devel>=3.1.2 confuse-devel atf-devel"
short_desc="The XBPS package system utilities"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://code.google.com/p/xbps"
license="Simplified BSD"
distfiles="http://xbps.googlecode.com/files/xbps-$version.tar.gz"
checksum=95618f7bb728a6a1506a1f1af9d470db237c59b118d0aff4bc6985150b52e4c1
checksum=020c340cbbd5dd1913203671fb8a5c4565fb928ad9d8eb4f43674a6c2f513606
libxbps_package() {
short_desc+=" - runtime library"
replaces="xbps<0.16.3_2 libxbps>=0"
pkg_install() {
vmove "usr/lib/*.so*"
vmove "usr/lib/*.so.*"
}
}
libxbps-devel_package() {
short_desc+=" - runtime library (development files)"
depends="zlib-devel proplib-devel confuse-devel libfetch-devel
libarchive-devel libxbps>=${version}"
depends="zlib-devel libarchive-devel libxbps>=${version}"
replaces="xbps-static<0.16.3_2 libxbps-devel>=0"
pkg_install() {
vmove usr/include
vmove "usr/lib/*.a"
vmove "usr/lib/*.so"
vmove usr/lib/pkgconfig
}
}

8
srcpkgs/xf86-input-evdev/template
View file

@ -1,10 +1,10 @@
# Template build file for 'xf86-input-evdev'.
pkgname=xf86-input-evdev
version=2.8.0
revision=1
revision=2
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="xorg-server-devel>=1.13.3_3 mtdev-devel"
makedepends="xorg-server-devel>=1.14 mtdev-devel"
short_desc="Xorg event device input driver"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://xorg.freedesktop.org/"
@ -14,7 +14,7 @@ checksum=2f5b4403955f8e82603acff7f8f21a67e89a7c0230e1506c6924c4b9dd8f0e57
xf86-input-evdev-devel_package() {
depends="xorg-server-devel ${sourcepkg}>=${version}"
short_desc="${short_desc} - development files"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
vmove usr/lib/pkgconfig
@ -22,7 +22,7 @@ xf86-input-evdev-devel_package() {
}
xf86-input-evdev_package() {
depends="xserver-abi-input>=18<19"
depends="xserver-abi-input-19_1"
pkg_install() {
vmove usr
}

11
srcpkgs/xf86-input-joystick/template
View file

@ -1,10 +1,10 @@
# Template build file for 'xf86-input-joystick'.
pkgname=xf86-input-joystick
version=1.6.2
revision=2
revision=3
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="xorg-server-devel>=1.13.1"
makedepends="xorg-server-devel>=1.14"
short_desc="Joystick Input driver for Xorg"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://xorg.freedesktop.org/"
@ -17,7 +17,7 @@ post_install() {
}
xf86-input-joystick-devel_package() {
short_desc="${short_desc} -- development files"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
vmove usr/lib/pkgconfig
@ -25,9 +25,8 @@ xf86-input-joystick-devel_package() {
}
xf86-input-joystick_package() {
depends="xserver-abi-input>=18<19"
depends="xserver-abi-input-19_1"
pkg_install() {
vmove etc
vmove usr
vmove all
}
}

8
srcpkgs/xf86-input-synaptics/template
View file

@ -1,11 +1,11 @@
# Template build file for 'xf86-input-synaptics'.
pkgname=xf86-input-synaptics
version=1.7.1
revision=1
revision=2
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="libX11-devel libXtst-devel mtdev-devel
pixman-devel libpciaccess-devel xorg-server-devel>=1.13.1"
pixman-devel libpciaccess-devel xorg-server-devel>=1.14"
short_desc="Xorg synaptics touchpad input driver"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.x.org/"
@ -22,8 +22,8 @@ xf86-input-synaptics-devel_package() {
}
xf86-input-synaptics_package() {
depends="xserver-abi-input>=18<19"
depends="xserver-abi-input-19_1"
pkg_install() {
vmove usr
vmove all
}
}

9
srcpkgs/xf86-input-vmmouse/template
View file

@ -1,9 +1,10 @@
# Template build file for 'xf86-input-vmmouse'.
pkgname=xf86-input-vmmouse
version=13.0.0
revision=1
revision=2
build_style=gnu-configure
makedepends="xorg-server-devel>=1.13.1"
hostmakedepends="pkg-config"
makedepends="xorg-server-devel>=1.14"
short_desc="Xorg VMware virtual mouse input driver"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://xorg.freedesktop.org"
@ -17,8 +18,8 @@ post_install() {
}
xf86-input-vmmouse_package() {
depends="xserver-abi-input>=18<19"
depends="xserver-abi-input-19_1"
pkg_install() {
vmove usr
vmove all
}
}

10
srcpkgs/xf86-input-wacom/template
View file

@ -1,10 +1,10 @@
# Template build file for 'xf86-input-wacom'.
pkgname=xf86-input-wacom
version=0.19.0
revision=2
revision=3
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="xorg-server-devel>=1.13.1 libXrandr-devel libXinerama-devel libXi-devel"
makedepends="xorg-server-devel>=1.14 libXrandr-devel libXinerama-devel libXi-devel"
short_desc="Xorg Wacom tablet input driver"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://xorg.freedesktop.org"
@ -17,7 +17,7 @@ post_install() {
}
xf86-input-wacom-devel_package() {
short_desc="${short_desc} -- development files"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
vmove usr/lib/pkgconfig
@ -25,8 +25,8 @@ xf86-input-wacom-devel_package() {
}
xf86-input-wacom_package() {
depends="xserver-abi-input>=18<19"
depends="xserver-abi-input-19_1"
pkg_install() {
vmove usr
vmove all
}
}

11
srcpkgs/xf86-video-ati/template
View file

@ -1,10 +1,11 @@
# Template build file for 'xf86-video-ati'.
pkgname=xf86-video-ati
version=7.1.0
revision=1
revision=2
build_style=gnu-configure
makedepends="pkg-config xf86driproto libudev-devel>=183 libpciaccess-devel
libdrm-devel pixman-devel MesaLib-devel>=9.0.2 xorg-server-devel>=1.13<1.14"
hostmakedepends="pkg-config"
makedepends="xf86driproto libudev-devel>=183 libpciaccess-devel
libdrm-devel pixman-devel MesaLib-devel>=9.0.2 xorg-server-devel>=1.14"
short_desc="Xorg ATI Radeon video driver"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://xorg.freedesktop.org"
@ -14,8 +15,8 @@ checksum=c8ae44051fcb331625217f98c09a3aa69f493052b69d62c03f41fed0bfe610cd
xf86-video-ati_package() {
replaces="xf86-video-ati>=0"
depends="xserver-abi-video>=13<14 mesa-ati-dri"
depends="xserver-abi-video-14_1 mesa-ati-dri"
pkg_install() {
vmove usr
vmove all
}
}

15
srcpkgs/xf86-video-cirrus/template
View file

@ -1,21 +1,20 @@
# Template build file for 'xf86-video-cirrus'.
pkgname=xf86-video-cirrus
version=1.5.1
revision=2
version=1.5.2
revision=1
build_style=gnu-configure
makedepends="pkg-config xorg-server-devel>=1.13<1.14"
hostmakedepends="pkg-config"
makedepends="xorg-server-devel>=1.14"
short_desc="Xorg Cirrus Logic video driver"
homepage="http://xorg.freedesktop.org"
license="MIT"
maintainer="Juan RP <xtraeme@gmail.com>"
distfiles="${XORG_SITE}/driver/${pkgname}-${version}.tar.bz2"
checksum=a955429cbd673230c4b171afd6d0a6b28372d2f9d0a400f5124869274a27c557
long_desc="
This is the X11 video driver for Cirrus Logic video cards."
checksum=3361e1a65d9b84c464752fd612bdf6087622c6dd204121715366a170e5c3ccd7
xf86-video-cirrus_package() {
depends="xserver-abi-video>=13<14"
depends="xserver-abi-video-14_1"
pkg_install() {
vmove usr
vmove all
}
}

8
srcpkgs/xf86-video-fbdev/template
View file

@ -1,10 +1,10 @@
# Template build file for 'xf86-video-fbdev'.
pkgname=xf86-video-fbdev
version=0.4.3
revision=1
revision=2
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="xorg-server-devel>=1.13<1.14"
makedepends="xorg-server-devel>=1.14"
short_desc="Xorg framebuffer video driver"
homepage="http://xorg.freedesktop.org"
license="MIT"
@ -17,8 +17,8 @@ if [ "$CROSS_BUILD" ]; then
fi
xf86-video-fbdev_package() {
depends="xserver-abi-video>=13<14"
depends="xserver-abi-video-14_1"
pkg_install() {
vmove usr
vmove all
}
}

46
srcpkgs/xf86-video-geode/patches/ed0b153f320a95a11bd561726d2405823573500e.patch Normal file
View file

@ -0,0 +1,46 @@
From ed0b153f320a95a11bd561726d2405823573500e Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@redhat.com>
Date: Thu, 10 Jan 2013 03:16:26 +0000
Subject: Remove mibstore.h
Signed-off-by: Adam Jackson <ajax@redhat.com>
---
diff --git a/src/geode_driver.c b/src/geode_driver.c
index b27bfd5..9cd0af9 100644
--- src/geode_driver.c
+++ src/geode_driver.c
@@ -59,8 +59,6 @@
/* Machine independent stuff */
#include "mipointer.h"
#include "micmap.h"
-/* All drivers implementing backing store need this */
-#include "mibstore.h"
#include "vgaHW.h"
#include "vbe.h"
diff --git a/src/gx_driver.c b/src/gx_driver.c
index 5268f29..7f44e19 100644
--- src/gx_driver.c
+++ src/gx_driver.c
@@ -1350,7 +1350,6 @@ GXScreenInit(SCREEN_INIT_ARGS_DECL)
if (!pGeode->NoAccel)
GXAccelInit(pScrn);
- miInitializeBackingStore(pScrn);
xf86SetBackingStore(pScrn);
/* Set up the soft cursor */
diff --git a/src/lx_driver.c b/src/lx_driver.c
index 6d7f37f..146578e 100644
--- src/lx_driver.c
+++ src/lx_driver.c
@@ -932,7 +932,6 @@ LXScreenInit(SCREEN_INIT_ARGS_DECL)
if (!pGeode->NoAccel)
pGeode->NoAccel = LXExaInit(pScrn) ? FALSE : TRUE;
- miInitializeBackingStore(pScrn);
xf86SetBackingStore(pScrn);
/* Set up the soft cursor */
--
cgit v0.9.0.2-2-gbebe

10
srcpkgs/xf86-video-geode/template
View file

@ -1,7 +1,7 @@
# Template build file for 'xf86-video-geode'.
pkgname=xf86-video-geode
version=2.11.14
revision=2
revision=3
build_style=gnu-configure
short_desc="Xorg AMD Geode GX/LX video driver"
maintainer="Juan RP <xtraeme@gmail.com>"
@ -9,16 +9,14 @@ distfiles="${XORG_SITE}/driver/$pkgname-$version.tar.bz2"
homepage="http://xorg.freedesktop.org/"
license="MIT"
checksum=4c750b46c932934faa008919922f5ac8a572afcfe265ac8d7c203b8167a0cfcc
long_desc="
This is the Xorg video driver for AMD Geode GX/LX video cards."
# This is x86 specific.
only_for_archs=i686
makedepends="pkg-config libXv-devel libXrandr-devel xorg-server-devel>=1.13<1.14"
makedepends="pkg-config libXv-devel libXrandr-devel xorg-server-devel>=1.14"
xf86-video-geode_package() {
depends="xserver-abi-video>=13<14"
depends="xserver-abi-video-14_1"
pkg_install() {
vmove usr
vmove all
}
}

8
srcpkgs/xf86-video-intel/template
View file

@ -1,12 +1,12 @@
# Template build file for 'xf86-video-intel'.
pkgname=xf86-video-intel
version=2.21.11
revision=2
revision=3
build_style=gnu-configure
configure_args="--with-default-accel=sna --enable-kms-only --enable-sna"
makedepends="pkg-config dri2proto>=2.6 libudev-devel>=183 libdrm-devel
libpciaccess-devel libXext-devel libXfixes-devel libXv-devel libXvMC-devel
xcb-util-devel>=0.3.9 MesaLib-devel xorg-server-devel>=1.13<1.14"
xcb-util-devel>=0.3.9 MesaLib-devel xorg-server-devel>=1.14"
short_desc="Xorg DDX Intel video driver"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://xorg.freedesktop.org/"
@ -21,8 +21,8 @@ post_install() {
}
xf86-video-intel_package() {
depends="xserver-abi-video>=13<14 mesa-intel-dri"
depends="xserver-abi-video>=14_1 mesa-intel-dri"
pkg_install() {
vmove usr
vmove all
}
}

8
srcpkgs/xf86-video-modesetting/template
View file

@ -1,10 +1,10 @@
# Template build file for 'xf86-video-modesetting'.
pkgname=xf86-video-modesetting
version=0.8.0
revision=1
revision=2
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="libdrm-devel>=2.4.37 xorg-server-devel>=1.13<1.14"
makedepends="libdrm-devel>=2.4.37 xorg-server-devel>=1.14"
short_desc="X.org generic modesetting video driver"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://xorg.freedesktop.org/"
@ -13,8 +13,8 @@ distfiles="${XORG_SITE}/driver/${pkgname}-${version}.tar.bz2"
checksum=13dc349e9aa50987ab2479d27d6879cda2c1f9ad8c8d3a1422a2f53c36f047f8
xf86-video-modesetting_package() {
depends="xserver-abi-video>=13<14"
depends="xserver-abi-video-14_1"
pkg_install() {
vmove usr
vmove all
}
}

8
srcpkgs/xf86-video-nouveau/template
View file

@ -1,10 +1,10 @@
# Template build file for 'xf86-video-nouveau'.
pkgname=xf86-video-nouveau
version=1.0.8
revision=1
revision=2
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="libudev-devel>=183 libdrm-devel xorg-server-devel>=1.13<1.14"
makedepends="libudev-devel>=183 libdrm-devel xorg-server-devel>=1.14"
short_desc="Xorg opensource NVIDIA video driver"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://nouveau.freedesktop.org/wiki/"
@ -13,8 +13,8 @@ distfiles="http://xorg.freedesktop.org/archive/individual/driver/${pkgname}-${ve
checksum=9b904314b8e9c7a5800724a6a31038ed88fa3fcfd35da6f4015fc104c8283617
xf86-video-nouveau_package() {
depends="xserver-abi-video>=13<14 mesa-nouveau-dri"
depends="xserver-abi-video-14_1 mesa-nouveau-dri"
pkg_install() {
vmove usr
vmove all
}
}

10
srcpkgs/xf86-video-openchrome/template
View file

@ -1,24 +1,22 @@
# Template build file for 'xf86-video-openchrome'.
pkgname=xf86-video-openchrome
version=0.3.1
revision=2
revision=3
only_for_archs=i686
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="libdrm-devel libX11-devel libXext-devel libXv-devel libXvMC-devel
MesaLib-devel xorg-server-devel>=1.13<1.14"
MesaLib-devel xorg-server-devel>=1.14"
short_desc="Xorg VIA Unichromes video driver"
homepage="http://xorg.freedesktop.org"
license="MIT"
maintainer="Juan RP <xtraeme@gmail.com>"
distfiles="${XORG_SITE}/driver/${pkgname}-${version}.tar.bz2"
checksum=eb459a86e20fa090577315a0d9964bf3f94abc5241c5408453f326eaf8915ce7
long_desc="
This is the X11 video driver for VIA Unichromes video cards."
xf86-video-openchrome_package() {
depends="xserver-abi-video>=13<14"
depends="xserver-abi-video-14_1"
pkg_install() {
vmove usr
vmove all
}
}

23
srcpkgs/xf86-video-qxl/template
View file

@ -1,23 +0,0 @@
# Template build file for 'xf86-video-qxl'.
pkgname=xf86-video-qxl
version=0.1.0
revision=3
build_style=gnu-configure
configure_args="--enable-xspice=yes"
makedepends="pkg-config xf86dgaproto spice-protocol>=0.12.2 spice-devel>=0.12
xorg-server-devel>=1.13<1.14"
short_desc="Modular Xorg QXL virtual video driver"
homepage="http://xorg.freedesktop.org"
license="MIT"
maintainer="Juan RP <xtraeme@gmail.com>"
distfiles="${XORG_SITE}/driver/$pkgname-$version.tar.bz2"
checksum=5ca3c1039fc195e73fa68558d0d7ee2b97cf10f4e7474ca533732a5d39ebbce5
long_desc="
This is the QXL virtual video driver for the modular Xorg server."
xf86-video-qxl_package() {
depends="xserver-abi-video>=13<14 spice>=0.12"
pkg_install() {
vmove usr
}
}

29
srcpkgs/xf86-video-sisusb/patches/git-fixes.patch Normal file
View file

@ -0,0 +1,29 @@
From 293d0902705c272b83432a955fb6a3c96dd6cea7 Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@redhat.com>
Date: Tue, 25 Sep 2012 12:54:52 +0000
Subject: Remove mibstore.h
Signed-off-by: Adam Jackson <ajax@redhat.com>
---
diff --git a/src/sisusb_driver.c b/src/sisusb_driver.c
index 539b9f1..0fdc8e9 100644
--- src/sisusb_driver.c
+++ src/sisusb_driver.c
@@ -39,7 +39,6 @@
#include "shadowfb.h"
#include "micmap.h"
#include "mipointer.h"
-#include "mibstore.h"
#include "sisusb_regs.h"
#include "sisusb_dac.h"
@@ -1907,7 +1906,6 @@ SISUSBScreenInit(SCREEN_INIT_ARGS_DECL)
/* Initialize the accelerators */
SiSUSBAccelInit(pScreen);
- miInitializeBackingStore(pScreen);
xf86SetBackingStore(pScreen);
/* NO SilkenMouse. Never. Ever. */
--
cgit v0.9.0.2-2-gbebe

8
srcpkgs/xf86-video-sisusb/template
View file

@ -1,9 +1,9 @@
# Template build file for 'xf86-video-sisusb'.
pkgname=xf86-video-sisusb
version=0.9.6
revision=2
revision=3
build_style=gnu-configure
makedepends="pkg-config xorg-server-devel>=1.13<1.14"
makedepends="pkg-config xorg-server-devel>=1.14"
short_desc="Xorg SiS USB video driver"
homepage="http://xorg.freedesktop.org/"
license="Custom"
@ -16,8 +16,8 @@ long_desc="
that are connected via a Net2280-based USB dongle for the Xorg X11 server."
xf86-video-sisusb_package() {
depends="xserver-abi-video>=13<14"
depends="xserver-abi-video-14_1"
pkg_install() {
vmove usr
vmove all
}
}

55
srcpkgs/xf86-video-vesa/patches/git-fixes.patch Normal file
View file

@ -0,0 +1,55 @@
From 7aafaf56fbca97f36c775462c1ceea3e03700c42 Mon Sep 17 00:00:00 2001
From: Alexandr Shadchin <alexandr.shadchin@gmail.com>
Date: Sat, 18 Aug 2012 14:53:34 +0000
Subject: Fix check function in VESASaveRestore
Signed-off-by: Alexandr Shadchin <Alexandr.Shadchin@gmail.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
---
diff --git a/src/vesa.c b/src/vesa.c
index 8ac77da..11cd26c 100644
--- src/vesa.c
+++ src/vesa.c
@@ -1626,7 +1626,7 @@ VESASaveRestore(ScrnInfoPtr pScrn, vbeSaveRestoreFunction function)
{
VESAPtr pVesa;
- if (MODE_QUERY < 0 || function > MODE_RESTORE)
+ if (function < MODE_QUERY || function > MODE_RESTORE)
return (FALSE);
pVesa = VESAGetRec(pScrn);
--
cgit v0.9.0.2-2-gbebe
From 60d2dc115c4b6210d3b1e05f5b0c39d1f7917cbc Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@redhat.com>
Date: Tue, 25 Sep 2012 12:55:03 +0000
Subject: Remove mibstore.h
Signed-off-by: Adam Jackson <ajax@redhat.com>
---
diff --git a/src/vesa.c b/src/vesa.c
index 11cd26c..b73d104 100644
--- src/vesa.c
+++ src/vesa.c
@@ -49,9 +49,6 @@
/* All drivers initialising the SW cursor need this */
#include "mipointer.h"
-/* All drivers implementing backing store need this */
-#include "mibstore.h"
-
/* Colormap handling */
#include "micmap.h"
#include "xf86cmap.h"
@@ -1081,7 +1078,6 @@ VESAScreenInit(SCREEN_INIT_ARGS_DECL)
VESADGAInit(pScrn, pScreen);
xf86SetBlackWhitePixels(pScreen);
- miInitializeBackingStore(pScreen);
xf86SetBackingStore(pScreen);
/* software cursor */
--
cgit v0.9.0.2-2-gbebe

8
srcpkgs/xf86-video-vesa/template
View file

@ -3,10 +3,10 @@ pkgname=xf86-video-vesa
_distver="2.3.2"
version="2:${_distver}"
wrksrc="${pkgname}-${_distver}"
revision=4
revision=5
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="xorg-server-devel>=1.13<1.14"
makedepends="xorg-server-devel>=1.14"
short_desc="Xorg VESA video driver"
homepage="http://xorg.freedesktop.org"
license="MIT"
@ -21,8 +21,8 @@ if [ "$CROSS_BUILD" ]; then
fi
xf86-video-vesa_package() {
depends="xserver-abi-video>=13<14"
depends="xserver-abi-video-14_1"
pkg_install() {
vmove usr
vmove all
}
}

6
srcpkgs/xf86-video-vmware/template
View file

@ -1,11 +1,11 @@
# Template build file for 'xf86-video-vmware'.
pkgname=xf86-video-vmware
version=13.0.1
revision=1
revision=2
build_style=gnu-configure
configure_args="--enable-vmwarectrl-client"
makedepends="pkg-config libdrm-devel MesaLib-devel>=9.0.1
xorg-server-devel>=1.13<1.14"
xorg-server-devel>=1.14"
short_desc="Modular Xorg VMware virtual video driver"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://xorg.freedesktop.org"
@ -14,7 +14,7 @@ distfiles="${XORG_SITE}/driver/$pkgname-$version.tar.bz2"
checksum=802dda415c22412edad6c3df44fe18a06e91d0f8456d9a58bac0d340fdf8fe3d
xf86-video-vmware_package() {
depends="xserver-abi-video>=13<14 mesa-vmwgfx-dri"
depends="xserver-abi-video-14_1 mesa-vmwgfx-dri"
pkg_install() {
vmove all
}

9
srcpkgs/xorg-server/template
View file

@ -1,7 +1,7 @@
# Template build file for 'xorg-server'.
pkgname=xorg-server
version=1.13.4
revision=3
version=1.14.2
revision=1
build_style=gnu-configure
configure_args="--enable-ipv6 --enable-xcsecurity --enable-record
--enable-xnest --enable-xephyr --enable-composite --enable-xvfb
@ -17,10 +17,9 @@ maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://xorg.freedesktop.org"
license="MIT/X11, BSD"
distfiles="${XORG_SITE}/xserver/${pkgname}-${version}.tar.bz2"
checksum=a2c969887f3c7b0f3f7d31e2ee8e91fa73ce81ba3c16d82da9150ffa302c98cf
checksum=f6ddfb3f1cfff2d69d45657aec626ebe8b5847810154ff7df7ed2072b076c86b
hostmakedepends="pkg-config perl flex"
makedepends="damageproto inputproto>=2.2 glproto>=1.4.15 xproto>=7.0.22
dri2proto>=2.1 xf86driproto randrproto videoproto compositeproto scrnsaverproto
resourceproto>=1.2.0 xineramaproto xcmiscproto bigreqsproto libudev-devel>=183
@ -108,7 +107,7 @@ xorg-server-devel_package() {
xorg-server_package() {
# See hw/xfree86/common/xf86Module.h. Only care for the major version.
provides="xserver-abi-extension-7 xserver-abi-input-18 xserver-abi-video-13"
provides="xserver-abi-extension-7_1 xserver-abi-input-19_1 xserver-abi-video-14_1"
depends="xkeyboard-config"
pkg_install() {
vmove all