From 9526ee659401dee7160f35cb62ded2779bcbbc99 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Mon, 25 Jan 2010 16:43:57 +0000
Subject: merged x11 repository into main

ref #255
---
 main/xrandr/APKBUILD                           | 26 +++++++++++++++++++++++
 main/xrandr/xrandr-1.3.0-clone-nameclash.patch | 29 ++++++++++++++++++++++++++
 2 files changed, 55 insertions(+)
 create mode 100644 main/xrandr/APKBUILD
 create mode 100644 main/xrandr/xrandr-1.3.0-clone-nameclash.patch

(limited to 'main/xrandr')

diff --git a/main/xrandr/APKBUILD b/main/xrandr/APKBUILD
new file mode 100644
index 000000000..fefa3aa84
--- /dev/null
+++ b/main/xrandr/APKBUILD
@@ -0,0 +1,26 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=xrandr
+pkgver=1.3.2
+pkgrel=0
+pkgdesc="primitive command line interface to RandR extension"
+url="http://xorg.freedesktop.org/"
+license="custom"
+subpackages="$pkgname-doc"
+depends=
+makedepends="pkgconfig libxrandr-dev libxrender-dev libx11-dev"
+source="http://xorg.freedesktop.org/releases/individual/app/$pkgname-$pkgver.tar.bz2
+	$pkgname-1.3.0-clone-nameclash.patch"
+
+build () {
+	cd "$srcdir"/$pkgname-$pkgver
+	patch -p1 < ../$pkgname-1.3.0-clone-nameclash.patch || return 1
+	./configure --prefix=/usr --mandir=/usr/share/man || return 1
+	make || return 1
+}
+
+package() {
+	cd "$srcdir"/$pkgname-$pkgver
+	make DESTDIR="$pkgdir" install || return 1
+}
+md5sums="2cb19bb1c19ccf77c40032b03dbe06f0  xrandr-1.3.2.tar.bz2
+b938aad95a5ea71bce7a2529fd8f6866  xrandr-1.3.0-clone-nameclash.patch"
diff --git a/main/xrandr/xrandr-1.3.0-clone-nameclash.patch b/main/xrandr/xrandr-1.3.0-clone-nameclash.patch
new file mode 100644
index 000000000..55af5590c
--- /dev/null
+++ b/main/xrandr/xrandr-1.3.0-clone-nameclash.patch
@@ -0,0 +1,29 @@
+--- xrandr-1.3.0/xrandr.c.orig	2009-04-10 12:26:02.000000000 +0000
++++ xrandr-1.3.0/xrandr.c	2009-04-10 12:43:44.000000000 +0000
+@@ -209,7 +209,7 @@
+ 
+ #if HAS_RANDR_1_2
+ typedef enum _policy {
+-    clone, extend
++    p_clone, extend
+ } policy_t;
+ 
+ typedef enum _relation {
+@@ -2027,7 +2027,7 @@
+     int		ret = 0;
+ #if HAS_RANDR_1_2
+     output_t	*output = NULL;
+-    policy_t	policy = clone;
++    policy_t	policy = p_clone;
+     Bool    	setit_1_2 = False;
+     Bool    	query_1_2 = False;
+     Bool	modeit = False;
+@@ -2401,7 +2401,7 @@
+ 	    continue;
+ 	}
+ 	if (!strcmp ("--clone", argv[i])) {
+-	    policy = clone;
++	    policy = p_clone;
+ 	    setit_1_2 = True;
+ 	    continue;
+ 	}
-- 
cgit v1.2.3