diff options
author | miwi <miwi@058c260c-8361-11dd-a0ac-aa2bafec7d09> | 2010-02-14 19:58:58 +0800 |
---|---|---|
committer | miwi <miwi@058c260c-8361-11dd-a0ac-aa2bafec7d09> | 2010-02-14 19:58:58 +0800 |
commit | efd775afc0e07fccdebcfb0bdeaaca0ad272f62a (patch) | |
tree | 27b613e8ec7c9bedc4a78bd1e56cb9574247f16c | |
parent | 06394af145f06ea82410e95acde236852b5c7c19 (diff) | |
download | xorg-devel-ports-efd775afc0e07fccdebcfb0bdeaaca0ad272f62a.tar.gz xorg-devel-ports-efd775afc0e07fccdebcfb0bdeaaca0ad272f62a.tar.zst xorg-devel-ports-efd775afc0e07fccdebcfb0bdeaaca0ad272f62a.zip |
- Import first steps of xorg update
git-svn-id: https://trillian.chruetertee.ch/svn/ports/branches/xorg-dev@41 058c260c-8361-11dd-a0ac-aa2bafec7d09
25 files changed, 332 insertions, 0 deletions
diff --git a/devel/libpciaccess/Makefile b/devel/libpciaccess/Makefile new file mode 100644 index 0000000..25b1449 --- /dev/null +++ b/devel/libpciaccess/Makefile @@ -0,0 +1,23 @@ +# New ports collection makefile for: libpciaccess +# Date Created: May 11 2008 +# Whom: Florent Thoumie <flz@FreeBSD.org> +# +# $FreeBSD: ports/devel/libpciaccess/Makefile,v 1.9 2010/02/08 00:14:49 marius Exp $ +# + +PORTNAME= libpciaccess +PORTVERSION= 0.11.0 +CATEGORIES= devel + +MAINTAINER= x11@FreeBSD.org +COMMENT= Generic PCI access library + +BUILD_DEPENDS= ${LOCALBASE}/share/pciids/pci.ids:${PORTSDIR}/misc/pciids +# XXX - Is it a runtime dep too? +RUN_DEPENDS= ${LOCALBASE}/share/pciids/pci.ids:${PORTSDIR}/misc/pciids + +CONFIGURE_ARGS+= --with-pciids-path=${LOCALBASE}/share/pciids + +XORG_CAT= lib + +.include <bsd.port.mk> diff --git a/devel/libpciaccess/distinfo b/devel/libpciaccess/distinfo new file mode 100644 index 0000000..abf41db --- /dev/null +++ b/devel/libpciaccess/distinfo @@ -0,0 +1,3 @@ +MD5 (xorg/lib/libpciaccess-0.11.0.tar.bz2) = 686320dcec98daad0bdfb8894d4f2a2b +SHA256 (xorg/lib/libpciaccess-0.11.0.tar.bz2) = 6e38be12b656c83c66a6fd8ba56c041d8188218278219c88ee635242ec1c7dab +SIZE (xorg/lib/libpciaccess-0.11.0.tar.bz2) = 295639 diff --git a/devel/libpciaccess/files/patch-src-common_init.c b/devel/libpciaccess/files/patch-src-common_init.c new file mode 100644 index 0000000..d8028b2 --- /dev/null +++ b/devel/libpciaccess/files/patch-src-common_init.c @@ -0,0 +1,13 @@ +--- src/common_init.c.orig 2008-10-11 18:31:00.000000000 +0000 ++++ src/common_init.c 2009-03-29 20:10:52.000000000 +0000 +@@ -70,7 +70,9 @@ + void + pci_system_init_dev_mem(int fd) + { +-#ifdef __OpenBSD__ ++#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) ++ pci_system_freebsd_init_dev_mem(fd); ++#elif defined(__OpenBSD__) + pci_system_openbsd_init_dev_mem(fd); + #endif + } diff --git a/devel/libpciaccess/files/patch-src-freebsd_pci.c b/devel/libpciaccess/files/patch-src-freebsd_pci.c new file mode 100644 index 0000000..617c011 --- /dev/null +++ b/devel/libpciaccess/files/patch-src-freebsd_pci.c @@ -0,0 +1,113 @@ +--- src/freebsd_pci.c.orig 2009-05-07 10:35:59.000000000 -0500 ++++ src/freebsd_pci.c 2009-05-07 10:36:10.000000000 -0500 +@@ -72,6 +72,10 @@ + #define PCIM_BAR_MEM_SPACE 0 + #define PCIM_BAR_IO_SPACE 1 + ++#if defined(__sparc64__) ++static int screenfd; ++#endif ++ + /** + * FreeBSD private pci_system structure that extends the base pci_system + * structure. +@@ -103,12 +107,18 @@ + { + const int prot = ((map->flags & PCI_DEV_MAP_FLAG_WRITABLE) != 0) + ? (PROT_READ | PROT_WRITE) : PROT_READ; ++#if !defined(__sparc64__) + struct mem_range_desc mrd; + struct mem_range_op mro; ++#endif + + int fd, err = 0; + ++#if defined(__sparc64__) ++ fd = screenfd; ++#else + fd = open("/dev/mem", O_RDWR); ++#endif + if (fd == -1) + return errno; + +@@ -118,6 +128,7 @@ + err = errno; + } + ++#if !defined(__sparc64__) + mrd.mr_base = map->base; + mrd.mr_len = map->size; + strncpy(mrd.mr_owner, "pciaccess", sizeof(mrd.mr_owner)); +@@ -138,6 +149,7 @@ + } + + close(fd); ++#endif + + return err; + } +@@ -146,6 +158,7 @@ + pci_device_freebsd_unmap_range( struct pci_device *dev, + struct pci_device_mapping *map ) + { ++#if !defined(__sparc64__) + struct mem_range_desc mrd; + struct mem_range_op mro; + int fd; +@@ -171,6 +184,7 @@ + fprintf(stderr, "Failed to open /dev/mem\n"); + } + } ++#endif + + return pci_device_generic_unmap_range(dev, map); + } +@@ -293,20 +307,28 @@ + } + + printf("Using rom_base = 0x%lx\n", (long)rom_base); ++#if defined(__sparc64__) ++ memfd = screenfd; ++#else + memfd = open( "/dev/mem", O_RDONLY ); ++#endif + if ( memfd == -1 ) + return errno; + + bios = mmap( NULL, dev->rom_size, PROT_READ, 0, memfd, rom_base ); + if ( bios == MAP_FAILED ) { ++#if !defined(__sparc64__) + close( memfd ); ++#endif + return errno; + } + + memcpy( buffer, bios, dev->rom_size ); + + munmap( bios, dev->rom_size ); ++#if !defined(__sparc64__) + close( memfd ); ++#endif + + if (pci_rom) { + pci_device_cfg_write_u32( dev, PCIR_BIOS, rom ); +@@ -341,7 +363,6 @@ + static int + pci_device_freebsd_probe( struct pci_device * dev ) + { +- struct pci_device_private *priv = (struct pci_device_private *) dev; + struct pci_bar_io bar; + uint8_t irq; + int err, i; +@@ -644,3 +665,11 @@ + + return 0; + } ++ ++void ++pci_system_freebsd_init_dev_mem(int fd) ++{ ++#if defined(__sparc64__) ++ screenfd = fd; ++#endif ++} diff --git a/devel/libpciaccess/files/patch-src-pciaccess_private.h b/devel/libpciaccess/files/patch-src-pciaccess_private.h new file mode 100644 index 0000000..2d9cb99 --- /dev/null +++ b/devel/libpciaccess/files/patch-src-pciaccess_private.h @@ -0,0 +1,10 @@ +--- src/pciaccess_private.h.orig 2008-10-11 18:31:00.000000000 +0000 ++++ src/pciaccess_private.h 2009-03-29 20:07:50.000000000 +0000 +@@ -136,6 +136,7 @@ + + extern int pci_system_linux_sysfs_create( void ); + extern int pci_system_freebsd_create( void ); ++extern void pci_system_freebsd_init_dev_mem( int ); + extern int pci_system_netbsd_create( void ); + extern int pci_system_openbsd_create( void ); + extern void pci_system_openbsd_init_dev_mem( int ); diff --git a/devel/libpciaccess/pkg-descr b/devel/libpciaccess/pkg-descr new file mode 100644 index 0000000..77dbb55 --- /dev/null +++ b/devel/libpciaccess/pkg-descr @@ -0,0 +1,6 @@ +This package contains the pciaccess library. + +WWW: http://www.freedesktop.org/Software/xlibs + +- Florent Thoumie +flz@FreeBSD.org diff --git a/devel/libpciaccess/pkg-plist b/devel/libpciaccess/pkg-plist new file mode 100644 index 0000000..4fe963b --- /dev/null +++ b/devel/libpciaccess/pkg-plist @@ -0,0 +1,6 @@ +include/pciaccess.h +lib/libpciaccess.a +lib/libpciaccess.la +lib/libpciaccess.so +lib/libpciaccess.so.0 +libdata/pkgconfig/pciaccess.pc diff --git a/devel/makedepend/Makefile b/devel/makedepend/Makefile new file mode 100644 index 0000000..ede0612 --- /dev/null +++ b/devel/makedepend/Makefile @@ -0,0 +1,24 @@ +# New ports collection makefile for: makedepend +# Date created: August 15th 1997 +# Whom: Ian Vaudrey <i.vaudrey@bigfoot.com> +# +# $FreeBSD: ports/devel/makedepend/Makefile,v 1.15 2007/10/03 22:12:31 pav Exp $ +# + +PORTNAME= makedepend +PORTVERSION= 1.0.2 +PORTEPOCH= 1 +CATEGORIES= devel + +MAINTAINER= x11@FreeBSD.org +COMMENT= A dependency generator for makefiles + +XORG_CAT= util +USE_GNOME= pkgconfig +USE_XORG= xproto + +PLIST_FILES= bin/makedepend + +MAN1= makedepend.1 + +.include <bsd.port.mk> diff --git a/devel/makedepend/distinfo b/devel/makedepend/distinfo new file mode 100644 index 0000000..874d304 --- /dev/null +++ b/devel/makedepend/distinfo @@ -0,0 +1,3 @@ +MD5 (xorg/util/makedepend-1.0.2.tar.bz2) = 62e58330fe8d1e3e28c7a45779833a48 +SHA256 (xorg/util/makedepend-1.0.2.tar.bz2) = 41a2b090a32d7c5b2654783772248aba472702686e30018cfd9907137a967657 +SIZE (xorg/util/makedepend-1.0.2.tar.bz2) = 116339 diff --git a/devel/makedepend/pkg-descr b/devel/makedepend/pkg-descr new file mode 100644 index 0000000..0929505 --- /dev/null +++ b/devel/makedepend/pkg-descr @@ -0,0 +1,14 @@ +Makedepend is a makefile dependency generator from The XFree86 Project, Inc. +If you have X installed, you already have makedepend and do not need this port! + +Makedepend reads each sourcefile in sequence and parses it like a +C-preprocessor, processing all #include, #define, #undef, #ifdef, #ifndef, +#endif, #if and #else directives so that it can correctly tell which #include, +directives would be used in a compilation. Any #include, directives can +reference files having other #include directives, and parsing will occur in +these files as well. + +Every file that a sourcefile includes, directly or indirectly, is what +makedepend calls a "dependency". These dependencies are then written to a +makefile in such a way that make will know which object files must be +recompiled when a dependency has changed. diff --git a/x11/appres/Makefile b/x11/appres/Makefile new file mode 100644 index 0000000..d44a1ee --- /dev/null +++ b/x11/appres/Makefile @@ -0,0 +1,21 @@ +# New ports collection makefile for: appres +# Date Created: 15 Feb 2006 +# Whom: Florent Thoumie <flz@FreeBSD.org> +# +# $FreeBSD: ports/x11/appres/Makefile,v 1.1 2007/05/19 20:25:49 flz Exp $ +# + +PORTNAME= appres +PORTVERSION= 1.0.2 +CATEGORIES= x11 + +MAINTAINER= x11@FreeBSD.org +COMMENT= Program to list application's resources + +XORG_CAT= app +USE_XORG= x11 xt + +MAN1= appres.1 +PLIST_FILES= bin/appres + +.include <bsd.port.mk> diff --git a/x11/appres/distinfo b/x11/appres/distinfo new file mode 100644 index 0000000..ba6193b --- /dev/null +++ b/x11/appres/distinfo @@ -0,0 +1,3 @@ +MD5 (xorg/app/appres-1.0.2.tar.bz2) = 6f2f5d9f41669d498b56d73dc3206951 +SHA256 (xorg/app/appres-1.0.2.tar.bz2) = 37d0fbb16c553fa09878d107f29f26c2ca4206c98dd23c44a0cb670ace531e36 +SIZE (xorg/app/appres-1.0.2.tar.bz2) = 95494 diff --git a/x11/appres/pkg-descr b/x11/appres/pkg-descr new file mode 100644 index 0000000..6a5b906 --- /dev/null +++ b/x11/appres/pkg-descr @@ -0,0 +1,4 @@ +The appres program prints the resources seen by an application (or +subhierarchy of an application) with the specified class and instance +names. It can be used to determine which resources a particular +program will load. diff --git a/x11/compositeproto/Makefile b/x11/compositeproto/Makefile new file mode 100644 index 0000000..9430916 --- /dev/null +++ b/x11/compositeproto/Makefile @@ -0,0 +1,17 @@ +# New ports collection makefile for: compositeproto +# Date Created: 08 Aug 2005 +# Whom: Dejan Lesjak <lesi@FreeBSD.org> +# +# $FreeBSD: ports/x11/compositeproto/Makefile,v 1.2 2007/09/13 19:44:57 flz Exp $ +# + +PORTNAME= compositeproto +PORTVERSION= 0.4.1 +CATEGORIES= x11 + +MAINTAINER= x11@FreeBSD.org +COMMENT= Composite extension headers + +XORG_CAT= proto + +.include <bsd.port.mk> diff --git a/x11/compositeproto/distinfo b/x11/compositeproto/distinfo new file mode 100644 index 0000000..716ffd4 --- /dev/null +++ b/x11/compositeproto/distinfo @@ -0,0 +1,3 @@ +MD5 (xorg/proto/compositeproto-0.4.1.tar.bz2) = 3692f3f8b2ea10dff3d2cede8dc65e79 +SHA256 (xorg/proto/compositeproto-0.4.1.tar.bz2) = e2744576731e1416503aade0d58a7861d0260f70b993351473a9f38ced606984 +SIZE (xorg/proto/compositeproto-0.4.1.tar.bz2) = 90083 diff --git a/x11/compositeproto/pkg-descr b/x11/compositeproto/pkg-descr new file mode 100644 index 0000000..9ce2690 --- /dev/null +++ b/x11/compositeproto/pkg-descr @@ -0,0 +1,4 @@ +This package contains X.Org Composite extension headers. + +- Joel Dahl +joel@FreeBSD.org diff --git a/x11/compositeproto/pkg-plist b/x11/compositeproto/pkg-plist new file mode 100644 index 0000000..ae280eb --- /dev/null +++ b/x11/compositeproto/pkg-plist @@ -0,0 +1,6 @@ +include/X11/extensions/composite.h +include/X11/extensions/compositeproto.h +libdata/pkgconfig/compositeproto.pc +share/doc/compositeproto/compositeproto.txt +@dirrm share/doc/compositeproto +@dirrmtry include/X11/extensions diff --git a/x11/damageproto/Makefile b/x11/damageproto/Makefile new file mode 100644 index 0000000..4bca79a --- /dev/null +++ b/x11/damageproto/Makefile @@ -0,0 +1,17 @@ +# New ports collection makefile for: damageproto +# Date Created: 08 Aug 2005 +# Whom: Dejan Lesjak <lesi@FreeBSD.org> +# +# $FreeBSD: ports/x11/damageproto/Makefile,v 1.1 2007/05/19 20:25:58 flz Exp $ +# + +PORTNAME= damageproto +PORTVERSION= 1.2.0 +CATEGORIES= x11 + +MAINTAINER= x11@FreeBSD.org +COMMENT= Damage extension headers + +XORG_CAT= proto + +.include <bsd.port.mk> diff --git a/x11/damageproto/distinfo b/x11/damageproto/distinfo new file mode 100644 index 0000000..03253db --- /dev/null +++ b/x11/damageproto/distinfo @@ -0,0 +1,3 @@ +MD5 (xorg/proto/damageproto-1.2.0.tar.bz2) = 434b931b02bd83ed9fc44951df81cdac +SHA256 (xorg/proto/damageproto-1.2.0.tar.bz2) = a50250770a2eead9d6fd56577e3328d0a6a1c4d425b58faa0f5ca7683169ee8f +SIZE (xorg/proto/damageproto-1.2.0.tar.bz2) = 53133 diff --git a/x11/damageproto/pkg-descr b/x11/damageproto/pkg-descr new file mode 100644 index 0000000..9ba4ce9 --- /dev/null +++ b/x11/damageproto/pkg-descr @@ -0,0 +1,5 @@ +This package contains X.Org Damage extension protocol specification +and header files. + +- Joel Dahl +joel@FreeBSD.org diff --git a/x11/damageproto/pkg-plist b/x11/damageproto/pkg-plist new file mode 100644 index 0000000..66a230a --- /dev/null +++ b/x11/damageproto/pkg-plist @@ -0,0 +1,6 @@ +include/X11/extensions/damageproto.h +include/X11/extensions/damagewire.h +libdata/pkgconfig/damageproto.pc +share/doc/damageproto/damageproto.txt +@dirrm share/doc/damageproto +@dirrmtry include/X11/extensions diff --git a/x11/dri2proto/Makefile b/x11/dri2proto/Makefile new file mode 100644 index 0000000..ef7690a --- /dev/null +++ b/x11/dri2proto/Makefile @@ -0,0 +1,17 @@ +# New ports collection makefile for: dri2proto +# Date Created: Jul 28 2008 +# Whom: Florent Thoumie <flz@FreeBSD.org> +# +# $FreeBSD: ports/x11/dri2proto/Makefile,v 1.4 2010/02/07 15:24:06 rnoland Exp $ +# + +PORTNAME= dri2proto +PORTVERSION= 2.2 +CATEGORIES= x11 + +MAINTAINER= x11@FreeBSD.org +COMMENT= DRI2 prototype headers + +XORG_CAT= proto + +.include <bsd.port.mk> diff --git a/x11/dri2proto/distinfo b/x11/dri2proto/distinfo new file mode 100644 index 0000000..71dc2fb --- /dev/null +++ b/x11/dri2proto/distinfo @@ -0,0 +1,3 @@ +MD5 (xorg/proto/dri2proto-2.2.tar.bz2) = 3ca8ddb42cd4ee31b8690031303221af +SHA256 (xorg/proto/dri2proto-2.2.tar.bz2) = f352950ffee4437d9da3e216d9a348ba0c7cf80c8c0fb30385c77ce3b780b2a1 +SIZE (xorg/proto/dri2proto-2.2.tar.bz2) = 94772 diff --git a/x11/dri2proto/pkg-descr b/x11/dri2proto/pkg-descr new file mode 100644 index 0000000..1e57ddb --- /dev/null +++ b/x11/dri2proto/pkg-descr @@ -0,0 +1,4 @@ +This package contains X.Org DRI2 prototype headers. + +- Florent Thoumie +flz@FreeBSD.org diff --git a/x11/dri2proto/pkg-plist b/x11/dri2proto/pkg-plist new file mode 100644 index 0000000..006d862 --- /dev/null +++ b/x11/dri2proto/pkg-plist @@ -0,0 +1,4 @@ +include/X11/extensions/dri2proto.h +include/X11/extensions/dri2tokens.h +libdata/pkgconfig/dri2proto.pc +@dirrmtry include/X11/extensions |