diff options
-rw-r--r-- | meta/packages/xorg-app/xauth_cvs.bb | 12 | ||||
-rw-r--r-- | meta/packages/xorg-app/xdpyinfo_cvs.bb | 11 | ||||
-rw-r--r-- | meta/packages/xorg-app/xhost_20040413.bb | 13 | ||||
-rw-r--r-- | meta/packages/xorg-app/xmodmap_cvs.bb | 13 | ||||
-rw-r--r-- | meta/packages/xorg-app/xrandr_cvs.bb | 10 | ||||
-rw-r--r-- | meta/packages/xorg-app/xrdb_cvs.bb | 12 | ||||
-rw-r--r-- | meta/packages/xorg-app/xset_20040817.bb | 17 | ||||
-rw-r--r-- | meta/packages/xorg-proto/xproto-native_6.6.2.bb | 4 | ||||
-rw-r--r-- | meta/packages/xorg-proto/xproto-native_cvs.bb | 4 | ||||
-rw-r--r-- | meta/packages/xorg-proto/xproto_6.6.2+cvs20050226.bb | 12 | ||||
-rw-r--r-- | meta/packages/xorg-proto/xproto_6.6.2.bb | 12 | ||||
-rw-r--r-- | meta/packages/xorg-proto/xproto_cvs.bb | 14 | ||||
-rw-r--r-- | meta/packages/xorg-xserver/xserver-kdrive_cvs.bb | 51 | ||||
-rw-r--r-- | meta/packages/xorg-xserver/xserver-xorg_6.8.99.10.bb | 65 | ||||
-rw-r--r-- | meta/packages/xorg-xserver/xserver-xorg_6.8.99.11.bb | 65 | ||||
-rw-r--r-- | meta/packages/xorg-xserver/xserver-xorg_cvs.bb | 61 |
16 files changed, 0 insertions, 376 deletions
diff --git a/meta/packages/xorg-app/xauth_cvs.bb b/meta/packages/xorg-app/xauth_cvs.bb deleted file mode 100644 index 169de7a797..0000000000 --- a/meta/packages/xorg-app/xauth_cvs.bb +++ /dev/null | |||
@@ -1,12 +0,0 @@ | |||
1 | PV = "0.0+cvs${SRCDATE}" | ||
2 | LICENSE = "MIT" | ||
3 | DEPENDS = "virtual/libx11 libxau libxmu libxext" | ||
4 | DESCRIPTION = "X authority file utility" | ||
5 | SECTION = "x11/base" | ||
6 | PR = "r2" | ||
7 | |||
8 | SRC_URI = "${FREEDESKTOP_CVS}/xorg;module=xc/programs/xauth \ | ||
9 | file://autofoo.patch;patch=1" | ||
10 | S = "${WORKDIR}/xauth" | ||
11 | |||
12 | inherit autotools pkgconfig | ||
diff --git a/meta/packages/xorg-app/xdpyinfo_cvs.bb b/meta/packages/xorg-app/xdpyinfo_cvs.bb deleted file mode 100644 index 9a05f066ce..0000000000 --- a/meta/packages/xorg-app/xdpyinfo_cvs.bb +++ /dev/null | |||
@@ -1,11 +0,0 @@ | |||
1 | PV = "0.0+cvs${SRCDATE}" | ||
2 | LICENSE = "MIT" | ||
3 | DEPENDS = "virtual/libx11 libxext libxtst" | ||
4 | DESCRIPTION = "X display information utility" | ||
5 | SECTION = "x11/base" | ||
6 | PR = "r1" | ||
7 | |||
8 | SRC_URI = "${FREEDESKTOP_CVS}/xapps;module=xdpyinfo" | ||
9 | S = "${WORKDIR}/xdpyinfo" | ||
10 | |||
11 | inherit autotools pkgconfig | ||
diff --git a/meta/packages/xorg-app/xhost_20040413.bb b/meta/packages/xorg-app/xhost_20040413.bb deleted file mode 100644 index 59e8f32964..0000000000 --- a/meta/packages/xorg-app/xhost_20040413.bb +++ /dev/null | |||
@@ -1,13 +0,0 @@ | |||
1 | FIXEDSRCDATE = "${@bb.data.getVar('FILE', d, 1).split('_')[-1].split('.')[0]}" | ||
2 | LICENSE = "MIT" | ||
3 | PV = "0.0+cvs${FIXEDSRCDATE}" | ||
4 | DEPENDS = "virtual/libx11 libxext libxmu" | ||
5 | DESCRIPTION = "server access control program for X" | ||
6 | SECTION = "x11/base" | ||
7 | PR = "r2" | ||
8 | |||
9 | SRC_URI = "${FREEDESKTOP_CVS}/xorg;module=xc/programs/xhost;date=${FIXEDSRCDATE} \ | ||
10 | file://autofoo.patch;patch=1" | ||
11 | S = "${WORKDIR}/xhost" | ||
12 | |||
13 | inherit autotools pkgconfig | ||
diff --git a/meta/packages/xorg-app/xmodmap_cvs.bb b/meta/packages/xorg-app/xmodmap_cvs.bb deleted file mode 100644 index e2b3847e6b..0000000000 --- a/meta/packages/xorg-app/xmodmap_cvs.bb +++ /dev/null | |||
@@ -1,13 +0,0 @@ | |||
1 | PV = "0.0+cvs${SRCDATE}" | ||
2 | LICENSE = "MIT" | ||
3 | DESCRIPTION = "utility for modifying keymaps and pointer button mappings in X" | ||
4 | SECTION = "x11/base" | ||
5 | PR = "r1" | ||
6 | |||
7 | DEPENDS = "virtual/libx11" | ||
8 | |||
9 | SRC_URI = "${FREEDESKTOP_CVS}/xorg;module=xc/programs/xmodmap \ | ||
10 | file://autofoo.patch;patch=1" | ||
11 | S = "${WORKDIR}/xmodmap" | ||
12 | |||
13 | inherit autotools pkgconfig | ||
diff --git a/meta/packages/xorg-app/xrandr_cvs.bb b/meta/packages/xorg-app/xrandr_cvs.bb deleted file mode 100644 index 30a31e1569..0000000000 --- a/meta/packages/xorg-app/xrandr_cvs.bb +++ /dev/null | |||
@@ -1,10 +0,0 @@ | |||
1 | PV = "0.0+cvs${SRCDATE}" | ||
2 | LICENSE= "BSD-X" | ||
3 | DEPENDS = "libxrandr virtual/libx11 libxext" | ||
4 | DESCRIPTION = "X Resize and Rotate extension command." | ||
5 | SECTION = "x11/base" | ||
6 | |||
7 | SRC_URI = "${FREEDESKTOP_CVS}/xapps;module=xrandr" | ||
8 | S = "${WORKDIR}/xrandr" | ||
9 | |||
10 | inherit autotools pkgconfig | ||
diff --git a/meta/packages/xorg-app/xrdb_cvs.bb b/meta/packages/xorg-app/xrdb_cvs.bb deleted file mode 100644 index 1289a8cfce..0000000000 --- a/meta/packages/xorg-app/xrdb_cvs.bb +++ /dev/null | |||
@@ -1,12 +0,0 @@ | |||
1 | PV = "0.0+cvs${SRCDATE}" | ||
2 | DEPENDS = "virtual/libx11 libxmu libxext" | ||
3 | DESCRIPTION = "X server resource database utility" | ||
4 | SECTION = "x11/base" | ||
5 | LICENSE = "xrdb" | ||
6 | PR = "r2" | ||
7 | |||
8 | SRC_URI = "${FREEDESKTOP_CVS}/xorg;module=xc/programs/xrdb \ | ||
9 | file://autofoo.patch;patch=1" | ||
10 | S = "${WORKDIR}/xrdb" | ||
11 | |||
12 | inherit autotools pkgconfig | ||
diff --git a/meta/packages/xorg-app/xset_20040817.bb b/meta/packages/xorg-app/xset_20040817.bb deleted file mode 100644 index 3b91812b94..0000000000 --- a/meta/packages/xorg-app/xset_20040817.bb +++ /dev/null | |||
@@ -1,17 +0,0 @@ | |||
1 | DESCRIPTION = "user preference utility for X" | ||
2 | LICENSE = "MIT" | ||
3 | FIXEDSRCDATE = "${@bb.data.getVar('FILE', d, 1).split('_')[-1].split('.')[0]}" | ||
4 | PV = "0.0+cvs${FIXEDSRCDATE}" | ||
5 | PR = "r1" | ||
6 | |||
7 | DEPENDS = "virtual/libx11 libxext xextensions libxmu" | ||
8 | |||
9 | CFLAGS += "-D_GNU_SOURCE" | ||
10 | |||
11 | SECTION = "x11/base" | ||
12 | |||
13 | SRC_URI = "${FREEDESKTOP_CVS}/xorg;module=xc/programs/xset;date=${FIXEDSRCDATE} \ | ||
14 | file://autofoo.patch;patch=1" | ||
15 | S = "${WORKDIR}/xset" | ||
16 | |||
17 | inherit autotools pkgconfig | ||
diff --git a/meta/packages/xorg-proto/xproto-native_6.6.2.bb b/meta/packages/xorg-proto/xproto-native_6.6.2.bb deleted file mode 100644 index 6645f592bd..0000000000 --- a/meta/packages/xorg-proto/xproto-native_6.6.2.bb +++ /dev/null | |||
@@ -1,4 +0,0 @@ | |||
1 | SECTION = "unknown" | ||
2 | require xproto_${PV}.bb | ||
3 | inherit native | ||
4 | PROVIDES = "" | ||
diff --git a/meta/packages/xorg-proto/xproto-native_cvs.bb b/meta/packages/xorg-proto/xproto-native_cvs.bb deleted file mode 100644 index a34db98ab9..0000000000 --- a/meta/packages/xorg-proto/xproto-native_cvs.bb +++ /dev/null | |||
@@ -1,4 +0,0 @@ | |||
1 | SECTION = "unknown" | ||
2 | require xproto_cvs.bb | ||
3 | inherit native | ||
4 | PROVIDES = "" | ||
diff --git a/meta/packages/xorg-proto/xproto_6.6.2+cvs20050226.bb b/meta/packages/xorg-proto/xproto_6.6.2+cvs20050226.bb deleted file mode 100644 index 55bc32b768..0000000000 --- a/meta/packages/xorg-proto/xproto_6.6.2+cvs20050226.bb +++ /dev/null | |||
@@ -1,12 +0,0 @@ | |||
1 | LICENSE= "MIT" | ||
2 | SECTION = "x11/libs" | ||
3 | DESCRIPTION = "X protocol and ancillary headers." | ||
4 | |||
5 | SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xproto;date=20050226" | ||
6 | S = "${WORKDIR}/Xproto" | ||
7 | |||
8 | inherit autotools pkgconfig | ||
9 | |||
10 | do_stage() { | ||
11 | autotools_stage_all | ||
12 | } | ||
diff --git a/meta/packages/xorg-proto/xproto_6.6.2.bb b/meta/packages/xorg-proto/xproto_6.6.2.bb deleted file mode 100644 index 1f01c0979a..0000000000 --- a/meta/packages/xorg-proto/xproto_6.6.2.bb +++ /dev/null | |||
@@ -1,12 +0,0 @@ | |||
1 | SECTION = "x11/libs" | ||
2 | LICENSE= "MIT" | ||
3 | DESCRIPTION = "X protocol and ancillary headers." | ||
4 | |||
5 | SRC_URI = "${XLIBS_MIRROR}/xproto-${PV}.tar.gz" | ||
6 | S = "${WORKDIR}/xproto-${PV}" | ||
7 | |||
8 | inherit autotools pkgconfig | ||
9 | |||
10 | do_stage() { | ||
11 | autotools_stage_all | ||
12 | } | ||
diff --git a/meta/packages/xorg-proto/xproto_cvs.bb b/meta/packages/xorg-proto/xproto_cvs.bb deleted file mode 100644 index f42fa1bb43..0000000000 --- a/meta/packages/xorg-proto/xproto_cvs.bb +++ /dev/null | |||
@@ -1,14 +0,0 @@ | |||
1 | PV = "0.0+cvs${SRCDATE}" | ||
2 | LICENSE= "MIT" | ||
3 | SECTION = "x11/libs" | ||
4 | DESCRIPTION = "X protocol and ancillary headers." | ||
5 | |||
6 | SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xproto" | ||
7 | S = "${WORKDIR}/Xproto" | ||
8 | |||
9 | inherit autotools pkgconfig | ||
10 | |||
11 | |||
12 | do_stage() { | ||
13 | autotools_stage_all | ||
14 | } | ||
diff --git a/meta/packages/xorg-xserver/xserver-kdrive_cvs.bb b/meta/packages/xorg-xserver/xserver-kdrive_cvs.bb deleted file mode 100644 index c2b25973fb..0000000000 --- a/meta/packages/xorg-xserver/xserver-kdrive_cvs.bb +++ /dev/null | |||
@@ -1,51 +0,0 @@ | |||
1 | PV = "0.0+cvs${SRCDATE}" | ||
2 | DEFAULT_PREFERENCE = "-2" | ||
3 | |||
4 | LICENSE = "MIT" | ||
5 | DEPENDS = "tslib xproto libxdmcp xextproto xtrans libxau virtual/libx11 libxext libxrandr fixesproto damageproto libxfont resourceproto compositeproto xcalibrateext recordproto videoproto scrnsaverproto" | ||
6 | PROVIDES = "virtual/xserver" | ||
7 | RPROVIDES = "virtual/xserver" | ||
8 | PACKAGES = "xserver-kdrive-mach64 xserver-kdrive-fbdev xserver-kdrive-vesa xserver-kdrive-mga xserver-kdrive-via xserver-kdrive-ati xserver-kdrive-fake xserver-kdrive-i810 xserver-kdrive-xephyr xserver-kdrive-epson ${PN}-doc ${PN}-dev ${PN}-locale" | ||
9 | SECTION = "x11/base" | ||
10 | DESCRIPTION = "X server from freedesktop.org" | ||
11 | DESCRIPTION_xserver-kdrive-i810 = "X server from freedesktop.org, supporting i810 devices" | ||
12 | DESCRIPTION_xserver-kdrive-ati = "X server from freedesktop.org, supporting ATI devices" | ||
13 | DESCRIPTION_xserver-kdrive-mga = "X server from freedesktop.org, supporting MGA devices" | ||
14 | DESCRIPTION_xserver-kdrive-vesa = "X server from freedesktop.org, supporting generic VESA devices" | ||
15 | DESCRIPTION_xserver-kdrive-mach64 = "X server from freedesktop.org, supporting Mach64 devices" | ||
16 | DESCRIPTION_xserver-kdrive-via = "X server from freedesktop.org, supporting VIA CLE266 devices" | ||
17 | DESCRIPTION_xserver-kdrive-fbdev = "X server from freedesktop.org, supporting generic framebuffer devices" | ||
18 | DESCRIPTION_xserver-kdrive-epson = "X server from freedesktop.org, supporting Epson S1D13806 devices" | ||
19 | DESCRIPTION_xserver-kdrive-fake = "Fake X server" | ||
20 | DESCRIPTION_xserver-kdrive-xephyr = "X server in an X window" | ||
21 | |||
22 | PR = "r11" | ||
23 | |||
24 | FILES_xserver-kdrive-fbdev = "${bindir}/Xfbdev" | ||
25 | FILES_xserver-kdrive-ati = "${bindir}/Xati" | ||
26 | FILES_xserver-kdrive-vesa = "${bindir}/Xvesa" | ||
27 | FILES_xserver-kdrive-via = "${bindir}/Xvia" | ||
28 | FILES_xserver-kdrive-mga = "${bindir}/Xmga" | ||
29 | FILES_xserver-kdrive-mach64 = "${bindir}/Xmach64" | ||
30 | FILES_xserver-kdrive-fake = "${bindir}/Xfake" | ||
31 | FILES_xserver-kdrive-i810 = "${bindir}/Xi810" | ||
32 | FILES_xserver-kdrive-epson = "${bindir}/Xepson" | ||
33 | FILES_xserver-kdrive-xephyr = "${bindir}/Xephyr" | ||
34 | |||
35 | SRC_URI = "${FREEDESKTOP_CVS}/xserver;module=xserver \ | ||
36 | file://kmode.patch;patch=1 \ | ||
37 | file://disable-apm.patch;patch=1 \ | ||
38 | file://no-serial-probing.patch;patch=1 \ | ||
39 | file://kdrive-evdev.patch;patch=1 \ | ||
40 | file://kdrive-use-evdev.patch;patch=1 \ | ||
41 | file://fbdev-not-fix.patch;patch=1" | ||
42 | |||
43 | SRC_URI_append_mnci = " file://onlyfb.patch;patch=1" | ||
44 | SRC_URI_append_poodle = " file://xserver-kdrive-poodle.patch;patch=1" | ||
45 | PACKAGE_ARCH_poodle = "poodle" | ||
46 | |||
47 | S = "${WORKDIR}/xserver" | ||
48 | |||
49 | inherit autotools pkgconfig | ||
50 | |||
51 | EXTRA_OECONF = "--enable-composite --disable-xinerama" | ||
diff --git a/meta/packages/xorg-xserver/xserver-xorg_6.8.99.10.bb b/meta/packages/xorg-xserver/xserver-xorg_6.8.99.10.bb deleted file mode 100644 index 37546fe1ee..0000000000 --- a/meta/packages/xorg-xserver/xserver-xorg_6.8.99.10.bb +++ /dev/null | |||
@@ -1,65 +0,0 @@ | |||
1 | SECTION = "x11/base" | ||
2 | RPROVIDES = "virtual/xserver" | ||
3 | PROVIDES = "virtual/xserver" | ||
4 | LICENSE = "Xorg" | ||
5 | PR = "r2" | ||
6 | |||
7 | DEPENDS = "fontconfig freetype libxi libxmu flex-native zlib" | ||
8 | |||
9 | SRC_URI = "${FREEDESKTOP_CVS}/xorg;module=xc;method=pserver;tag=XORG-6_8_99_10 \ | ||
10 | file://imake-staging.patch;patch=1 \ | ||
11 | file://imake-installed.patch;patch=1 \ | ||
12 | file://fontfile.patch;patch=1 file://freetype.patch;patch=1 \ | ||
13 | file://dri.patch;patch=1" | ||
14 | |||
15 | PACKAGES =+ "xserver-xorg-xprint xserver-xorg-xvfb xserver-xorg-utils" | ||
16 | |||
17 | S = "${WORKDIR}/xc" | ||
18 | |||
19 | FILES_xserver-xorg-xprint = "${bindir}/Xprt /etc/init.d/xprint /etc/rc.d/rc*.d/*xprint /etc/X11/Xsession.d/92xprint-xpserverlist.sh /etc/X11/xinit/xinitrc.d/92xprint-xpserverlist.sh /etc/X11/xserver/*/print ${sysconfdir}/profile.d/xprint.*" | ||
20 | FILES_xserver-xorg-xvfb = "${bindir}/Xvfb" | ||
21 | FILES_xserver-xorg-utils = "${bindir}/scanpci ${bindir}/pcitweak ${bindir}/ioport ${bindir}/in[bwl] ${bindir}/out[bwl] ${bindir}/mmap[rw] ${bindir}/gtf ${bindir}/getconfig ${bindir}/getconfig.pl" | ||
22 | FILES_${PN} += "${libdir}/modules/*.o "${libdir}/modules/*/*.o ${libdir}/X11/Options ${libdir}/X11/getconfig ${libdir}/X11/etc ${libdir}/modules" | ||
23 | FILES_${PN}-doc += "${libdir}/X11/doc" | ||
24 | |||
25 | do_configure() { | ||
26 | cat <<EOF > config/cf/host.def | ||
27 | #define BuildServersOnly YES | ||
28 | #define ProjectRoot ${prefix} | ||
29 | #define XnestServer NO | ||
30 | #define XdmxServer NO | ||
31 | #define CcCmd gcc | ||
32 | #define LdCmd ld | ||
33 | #define HasFreetype2 YES | ||
34 | #define HasFontconfig YES | ||
35 | #define BuildDevelDRIDrivers YES | ||
36 | #define BuildXF86DRI YES | ||
37 | EOF | ||
38 | echo "" > config/cf/date.def | ||
39 | rm -f include/extensions/panoramiX.h | ||
40 | make -C config/imake -f Makefile.ini CC="${BUILD_CC}" BOOTSTRAPCFLAGS="${BUILD_CFLAGS}" CROSSCOMPILEDIR="${CROSS_DIR}/${TARGET_SYS}/bin" PREPROCESS_CMD="gcc -E" clean imake | ||
41 | make CC="${BUILD_CC}" xmakefile | ||
42 | make Makefiles | ||
43 | make clean | ||
44 | } | ||
45 | |||
46 | do_compile() { | ||
47 | #make depend | ||
48 | make includes | ||
49 | make -C config/util CC="${BUILD_CC}" | ||
50 | for l in font xtrans Xdmcp lbxutil; do make -C lib/$l CC="${CC}" LD="${LD}" CC_STAGING="-I${STAGING_INCDIR}" LD_STAGING="-L${STAGING_LIBDIR}"; done | ||
51 | make -C programs/Xserver CC="${CC}" LD="${LD}" CC_STAGING="-I${STAGING_INCDIR}" LD_STAGING="-L${STAGING_LIBDIR}" INSTALLED_LIBS="" CPP="${CC} -E" | ||
52 | } | ||
53 | |||
54 | do_install() { | ||
55 | make -C programs/Xserver DESTDIR="${D}" CC="${CC}" LD="${LD}" CC_STAGING="-I${STAGING_INCDIR}" LD_STAGING="-L${STAGING_LIBDIR}" INSTALLED_LIBS="" install | ||
56 | make -C lib/font DESTDIR="${D}" CC="${CC}" LD="${LD}" CC_STAGING="-I${STAGING_INCDIR}" LD_STAGING="-L${STAGING_LIBDIR}" INSTALLED_LIBS="" install | ||
57 | } | ||
58 | |||
59 | do_stage() { | ||
60 | install -d ${STAGING_INCDIR}/xserver-xorg | ||
61 | for i in i810 via; do | ||
62 | pushd ${S}/programs/Xserver/hw/xfree86/drivers/$i; install -m 0644 *.h ${STAGING_INCDIR}/xserver-xorg/; popd | ||
63 | done | ||
64 | install -m 0644 programs/Xserver/hw/xfree86/common/fourcc.h ${STAGING_INCDIR}/xserver-xorg/ | ||
65 | } | ||
diff --git a/meta/packages/xorg-xserver/xserver-xorg_6.8.99.11.bb b/meta/packages/xorg-xserver/xserver-xorg_6.8.99.11.bb deleted file mode 100644 index e60f62ef57..0000000000 --- a/meta/packages/xorg-xserver/xserver-xorg_6.8.99.11.bb +++ /dev/null | |||
@@ -1,65 +0,0 @@ | |||
1 | SECTION = "x11/base" | ||
2 | RPROVIDES = "virtual/xserver" | ||
3 | PROVIDES = "virtual/xserver" | ||
4 | LICENSE = "Xorg" | ||
5 | PR = "r0" | ||
6 | |||
7 | DEPENDS = "fontconfig freetype libxi libxmu flex-native zlib" | ||
8 | |||
9 | SRC_URI = "${FREEDESKTOP_CVS}/xorg;module=xc;method=pserver;tag=XORG-6_8_99_11 \ | ||
10 | file://imake-staging.patch;patch=1 \ | ||
11 | file://imake-installed.patch;patch=1 \ | ||
12 | file://fontfile.patch;patch=1 file://freetype.patch;patch=1 \ | ||
13 | file://dri.patch;patch=1" | ||
14 | |||
15 | PACKAGES =+ "xserver-xorg-xprint xserver-xorg-xvfb xserver-xorg-utils" | ||
16 | |||
17 | S = "${WORKDIR}/xc" | ||
18 | |||
19 | FILES_xserver-xorg-xprint = "${bindir}/Xprt /etc/init.d/xprint /etc/rc.d/rc*.d/*xprint /etc/X11/Xsession.d/92xprint-xpserverlist.sh /etc/X11/xinit/xinitrc.d/92xprint-xpserverlist.sh /etc/X11/xserver/*/print ${sysconfdir}/profile.d/xprint.*" | ||
20 | FILES_xserver-xorg-xvfb = "${bindir}/Xvfb" | ||
21 | FILES_xserver-xorg-utils = "${bindir}/scanpci ${bindir}/pcitweak ${bindir}/ioport ${bindir}/in[bwl] ${bindir}/out[bwl] ${bindir}/mmap[rw] ${bindir}/gtf ${bindir}/getconfig ${bindir}/getconfig.pl" | ||
22 | FILES_${PN} += "${libdir}/modules/*.o "${libdir}/modules/*/*.o ${libdir}/X11/Options ${libdir}/X11/getconfig ${libdir}/X11/etc ${libdir}/modules" | ||
23 | FILES_${PN}-doc += "${libdir}/X11/doc" | ||
24 | |||
25 | do_configure() { | ||
26 | cat <<EOF > config/cf/host.def | ||
27 | #define BuildServersOnly YES | ||
28 | #define ProjectRoot ${prefix} | ||
29 | #define XnestServer NO | ||
30 | #define XdmxServer NO | ||
31 | #define CcCmd gcc | ||
32 | #define LdCmd ld | ||
33 | #define HasFreetype2 YES | ||
34 | #define HasFontconfig YES | ||
35 | #define BuildDevelDRIDrivers YES | ||
36 | #define BuildXF86DRI YES | ||
37 | EOF | ||
38 | echo "" > config/cf/date.def | ||
39 | rm -f include/extensions/panoramiX.h | ||
40 | make -C config/imake -f Makefile.ini CC="${BUILD_CC}" BOOTSTRAPCFLAGS="${BUILD_CFLAGS}" CROSSCOMPILEDIR="${CROSS_DIR}/${TARGET_SYS}/bin" PREPROCESS_CMD="gcc -E" clean imake | ||
41 | make CC="${BUILD_CC}" xmakefile | ||
42 | make Makefiles | ||
43 | make clean | ||
44 | } | ||
45 | |||
46 | do_compile() { | ||
47 | #make depend | ||
48 | make includes | ||
49 | make -C config/util CC="${BUILD_CC}" | ||
50 | for l in font xtrans Xdmcp lbxutil; do make -C lib/$l CC="${CC}" LD="${LD}" CC_STAGING="-I${STAGING_INCDIR}" LD_STAGING="-L${STAGING_LIBDIR}"; done | ||
51 | make -C programs/Xserver CC="${CC}" LD="${LD}" CC_STAGING="-I${STAGING_INCDIR}" LD_STAGING="-L${STAGING_LIBDIR}" INSTALLED_LIBS="" CPP="${CC} -E" | ||
52 | } | ||
53 | |||
54 | do_install() { | ||
55 | make -C programs/Xserver DESTDIR="${D}" CC="${CC}" LD="${LD}" CC_STAGING="-I${STAGING_INCDIR}" LD_STAGING="-L${STAGING_LIBDIR}" INSTALLED_LIBS="" install | ||
56 | make -C lib/font DESTDIR="${D}" CC="${CC}" LD="${LD}" CC_STAGING="-I${STAGING_INCDIR}" LD_STAGING="-L${STAGING_LIBDIR}" INSTALLED_LIBS="" install | ||
57 | } | ||
58 | |||
59 | do_stage() { | ||
60 | install -d ${STAGING_INCDIR}/xserver-xorg | ||
61 | for i in i810 via; do | ||
62 | pushd ${S}/programs/Xserver/hw/xfree86/drivers/$i; install -m 0644 *.h ${STAGING_INCDIR}/xserver-xorg/; popd | ||
63 | done | ||
64 | install -m 0644 programs/Xserver/hw/xfree86/common/fourcc.h ${STAGING_INCDIR}/xserver-xorg/ | ||
65 | } | ||
diff --git a/meta/packages/xorg-xserver/xserver-xorg_cvs.bb b/meta/packages/xorg-xserver/xserver-xorg_cvs.bb deleted file mode 100644 index e410581e17..0000000000 --- a/meta/packages/xorg-xserver/xserver-xorg_cvs.bb +++ /dev/null | |||
@@ -1,61 +0,0 @@ | |||
1 | SECTION = "x11/base" | ||
2 | LICENSE = "Xorg" | ||
3 | RPROVIDES = "virtual/xserver" | ||
4 | PROVIDES = "virtual/xserver" | ||
5 | PR = "r3" | ||
6 | PV = "6.8.1+cvs${SRCDATE}" | ||
7 | |||
8 | DEPENDS = "fontconfig freetype libxi libxmu flex-2.5.4-native" | ||
9 | |||
10 | SRC_URI = "${FREEDESKTOP_CVS}/xorg;module=xc;method=pserver \ | ||
11 | file://imake-staging.patch;patch=1 \ | ||
12 | file://dri.patch;patch=1" | ||
13 | |||
14 | PACKAGES =+ "xserver-xorg-xprint xserver-xorg-xvfb xserver-xorg-utils" | ||
15 | |||
16 | S = "${WORKDIR}/xc" | ||
17 | |||
18 | FILES_xserver-xorg-xprint = "${bindir}/Xprt /etc/init.d/xprint /etc/rc.d/rc*.d/*xprint /etc/X11/Xsession.d/92xprint-xpserverlist.sh /etc/X11/xinit/xinitrc.d/92xprint-xpserverlist.sh /etc/X11/xserver/*/print" | ||
19 | FILES_xserver-xorg-xvfb = "${bindir}/Xvfb" | ||
20 | FILES_xserver-xorg-utils = "${bindir}/scanpci ${bindir}/pcitweak ${bindir}/ioport ${bindir}/in[bwl] ${bindir}/out[bwl] ${bindir}/mmap[rw] ${bindir}/gtf ${bindir}/getconfig ${bindir}/getconfig.pl" | ||
21 | FILES_${PN} += "${libdir}/modules/*.o "${libdir}/modules/*/*.o ${libdir}/X11/Options ${libdir}/X11/getconfig ${libdir}/X11/etc ${libdir}/modules" | ||
22 | FILES_${PN}-doc += "${libdir}/X11/doc" | ||
23 | |||
24 | do_configure() { | ||
25 | echo "#define BuildServersOnly YES" > config/cf/host.def | ||
26 | echo "#define ProjectRoot /usr" >> config/cf/host.def | ||
27 | echo "#define XnestServer NO" >> config/cf/host.def | ||
28 | echo "#define XdmxServer NO" >> config/cf/host.def | ||
29 | echo "#define CcCmd ${CC}" >> config/cf/host.def | ||
30 | echo "#define LdCmd ${LD}" >> config/cf/host.def | ||
31 | echo "#define HasFreetype2 YES" >> config/cf/host.def | ||
32 | echo "#define HasFontconfig YES" >> config/cf/host.def | ||
33 | echo "#define BuildDevelDRIDrivers YES" >>config/cf/host.def | ||
34 | echo "" > config/cf/date.def | ||
35 | rm -f include/extensions/panoramiX.h | ||
36 | } | ||
37 | |||
38 | do_compile() { | ||
39 | make -C config/imake -f Makefile.ini CC="${BUILD_CC}" BOOTSTRAPCFLAGS="${BUILD_CFLAGS}" clean imake | ||
40 | make CC="${BUILD_CC}" xmakefile | ||
41 | make Makefiles | ||
42 | make clean | ||
43 | #make depend | ||
44 | make includes | ||
45 | make -C config/util CC="${BUILD_CC}" | ||
46 | for l in font xtrans Xdmcp lbxutil; do make -C lib/$l CC="${CC}" LD="${LD}" CC_STAGING="-I${STAGING_INCDIR}" LD_STAGING="-L${STAGING_LIBDIR}"; done | ||
47 | make -C programs/Xserver CC="${CC}" LD="${LD}" CC_STAGING="-I${STAGING_INCDIR}" LD_STAGING="-L${STAGING_LIBDIR}" INSTALLED_LIBS="" | ||
48 | } | ||
49 | |||
50 | do_install() { | ||
51 | make -C programs/Xserver DESTDIR="${D}" CC="${CC}" LD="${LD}" CC_STAGING="-I${STAGING_INCDIR}" LD_STAGING="-L${STAGING_LIBDIR}" INSTALLED_LIBS="" install | ||
52 | make -C lib/font DESTDIR="${D}" CC="${CC}" LD="${LD}" CC_STAGING="-I${STAGING_INCDIR}" LD_STAGING="-L${STAGING_LIBDIR}" INSTALLED_LIBS="" install | ||
53 | } | ||
54 | |||
55 | do_stage() { | ||
56 | install -d ${STAGING_INCDIR}/xserver-xorg | ||
57 | for i in i810 via; do | ||
58 | pushd ${S}/programs/Xserver/hw/xfree86/drivers/$i; install -m 0644 *.h ${STAGING_INCDIR}/xserver-xorg/; popd | ||
59 | done | ||
60 | install -m 0644 programs/Xserver/hw/xfree86/common/fourcc.h ${STAGING_INCDIR}/xserver-xorg/ | ||
61 | } | ||