commit 1a5e6c4378bf3d6bf9358a4a54c188ede49cac8a parent d8d1061a4b3c0a88f2daa06e508a0f370925c506 Author: Hiltjo Posthuma <hiltjo@codemadness.org> Date: Fri, 16 May 2014 17:28:28 +0000 Merged update of xorg packages Diffstat:
117 files changed, 841 insertions(+), 138 deletions(-)
diff --git a/curl/curl.mk b/curl/curl.mk @@ -33,3 +33,5 @@ curl:QV: # remake static, see: http://curl.haxx.se/mail/archive-2003-03/0115.html rm -f src/curl make LDFLAGS="-all-static $LDFLAGS" + # remove .la files for now ? + find "`pwd`" -iname "*.la" -exec rm {} \; diff --git a/dmenu/config.mk b/dmenu/config.mk @@ -9,17 +9,17 @@ MANPREFIX = ${PREFIX}/share/man #X11LIB = /usr/X11R6/lib # Xinerama, comment if you don't want it -XINERAMALIBS = -lXinerama +#XINERAMALIBS = -lXinerama XINERAMAFLAGS = -DXINERAMA # includes and libs #INCS = -I${X11INC} -LIBS = -lX11 ${XINERAMALIBS} +#LIBS = -lX11 ${XINERAMALIBS} # flags CPPFLAGS += -D_BSD_SOURCE -D_POSIX_C_SOURCE=200809L -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS} CFLAGS += ${CPPFLAGS} -LDFLAGS += ${LIBS} +#LDFLAGS += ${LIBS} # compiler and linker #CC = cc diff --git a/dmenu/dmenu.mk b/dmenu/dmenu.mk @@ -1,5 +1,6 @@ TARG = dmenu -DEPS = xorglibx11 xorgxproto xorglibxinerama xorgxineramaproto xorglibxext xorglibxcb xorglibxau +DEPS = xorglibx11 xorgxproto xorglibxinerama xorgxineramaproto xorglibxext \ + xorglibxcb xorglibxau xorglibxdmcp <$mkbuild/mk.common-noinst diff --git a/dropbear/dropbear.mk b/dropbear/dropbear.mk @@ -15,5 +15,7 @@ INSTALL_MAN8 = dropbear.8 dropbear:QV: export CFLAGS="$CFLAGS $DEPS_CFLAGS" export LDFLAGS="$LDFLAGS $DEPS_LDFLAGS" - CC="$CC" ./configure --prefix="$prefix" --mandir="$ROOT/share/man" + CC="$CC" ./configure \ + --prefix="$prefix" \ + --mandir="$ROOT/share/man" make -j$nprocs diff --git a/dwm/dwm.mk b/dwm/dwm.mk @@ -1,5 +1,6 @@ TARG = dwm -DEPS = xorglibx11 xorgxproto xorglibxinerama xorglibxext xorglibxcb xorglibxau +DEPS = xorglibx11 xorgxproto xorglibxinerama xorglibxext \ + xorglibxcb xorglibxau xorglibxdmcp <$mkbuild/mk.common-noinst diff --git a/fontconfig/fontconfig.mk b/fontconfig/fontconfig.mk @@ -1,15 +1,19 @@ TARG = fontconfig -DEPS = expat freetype +DEPS = expat freetype libpng zlib <$mkbuild/mk.common-noinst fontconfig:QV: # skip building tests. printf "all:\n\ttrue\n\ninstall:\n\ttrue\n\n" > test/Makefile.in - export CFLAGS="$CFLAGS $DEPS_CFLAGS" - export LDFLAGS="$LDFLAGS $DEPS_LDFLAGS" -# export PKG_CONFIG="/bin/true" - ./configure --prefix="$prefix" \ +# export CFLAGS="$CFLAGS $DEPS_CFLAGS" +# export LDFLAGS="$LDFLAGS $DEPS_LDFLAGS" + export EXPAT_CFLAGS="-I${expat_includedir}" + export EXPAT_LIBS="-L${expat_libdir} -lexpat" + export FREETYPE_CFLAGS="-I${freetype_includedir}/" + export FREETYPE_LIBS="-lfreetype -L${freetype_libdir}" + CC="${CC} -static" ./configure \ + --prefix="$prefix" \ --mandir="$ROOT/share/man" \ --sysconfdir=/etc \ --localstatedir=/var \ @@ -20,9 +24,18 @@ fontconfig:QV: --disable-docs \ --disable-shared \ --enable-static + # build these ourselves later. + for f in fc-cache fc-cat fc-list fc-match fc-pattern fc-query fc-scan fc-validate; do + printf "all:\n\ttrue\n\ninstall:\n\ttrue\n\n" > "$f/Makefile" + done # make and install. - make -j$nprocs install \ - FREETYPE_LIBS="-lfreetype -L${freetype_libdir}" FREETYPE_CFLAGS="-I${freetype_includedir}" \ - DESTDIR="`pwd`/lib" + make -j$nprocs install DESTDIR="`pwd`/lib" + # build and link tools manually. + mkdir -p "`pwd`/lib/bin" + for f in fc-cache fc-cat fc-list fc-match fc-pattern fc-query fc-scan fc-validate; do + ${CC} "$f/$f.c" -o "$f/$f" -Lsrc/.libs/ -I. -lfontconfig \ + ${CFLAGS} ${LDFLAGS} ${DEPS_CFLAGS} ${DEPS_LDFLAGS} + cp "$f/$f" "`pwd`/lib/bin/" && echo "$f" + done # remove .la files for now ? find `pwd`/lib -iname "*.la" -exec rm {} \; diff --git a/freetype/depsinc.mk b/freetype/depsinc.mk @@ -1,6 +1,6 @@ <$freetype_DEPDIR/v.mk freetype_libdir = $freetype_DEPDIR/freetype-$v/lib/lib -freetype_includedir = $freetype_DEPDIR/freetype-$v/lib/include +freetype_includedir = $freetype_DEPDIR/freetype-$v/lib/include/freetype2 DEPS_CFLAGS = $DEPS_CFLAGS -I${freetype_includedir} DEPS_LDFLAGS = $DEPS_LDFLAGS -L${freetype_libdir} -lfreetype diff --git a/freetype/fix_exports.mk b/freetype/fix_exports.mk @@ -1,77 +0,0 @@ -# -# FreeType 2 exports sub-Makefile -# - - -# Copyright 2005, 2006 by -# David Turner, Robert Wilhelm, and Werner Lemberg. -# -# This file is part of the FreeType project, and may only be used, modified, -# and distributed under the terms of the FreeType project license, -# LICENSE.TXT. By continuing to use, modify, or distribute this file you -# indicate that you have read the license and understand and accept it -# fully. - - -# DO NOT INVOKE THIS MAKEFILE DIRECTLY! IT IS MEANT TO BE INCLUDED BY -# OTHER MAKEFILES. - - -# This sub-Makefile is used to compute the list of exported symbols whenever -# the EXPORTS_LIST variable is defined by one of the platform or compiler -# specific build files. -# -# EXPORTS_LIST contains the name of the `list' file, for example a Windows -# .DEF file. -# -ifneq ($(EXPORTS_LIST),) - - # CCexe is the compiler used to compile the `apinames' tool program - # on the host machine. This isn't necessarily the same as the compiler - # which can be a cross-compiler for a different architecture, for example. - # -# ifeq ($(CCexe),) -# CCexe := $(CC) -# endif - CCexe := cc - - # TE acts like T, but for executables instead of object files. - ifeq ($(TE),) - TE := $T - endif - - # The list of public headers we're going to parse. - PUBLIC_HEADERS := $(wildcard $(PUBLIC_DIR)/*.h) - - # The `apinames' source and executable. We use $E_BUILD as the host - # executable suffix, which *includes* the final dot. - # - # Note that $(APINAMES_OPTIONS) is empty, except for Windows compilers. - # - APINAMES_SRC := $(subst /,$(SEP),$(TOP_DIR)/src/tools/apinames.c) - APINAMES_EXE := $(subst /,$(SEP),$(OBJ_DIR)/apinames$(E_BUILD)) - - $(APINAMES_EXE): $(APINAMES_SRC) - $(CCexe) $(CCexe_CFLAGS) $(TE)$@ $< $(CCexe_LDFLAGS) - - .PHONY: symbols_list - - symbols_list: $(EXPORTS_LIST) - - # We manually add TT_New_Context and TT_RunIns, which are needed by TT - # debuggers, to the EXPORTS_LIST. - # - $(EXPORTS_LIST): $(APINAMES_EXE) $(PUBLIC_HEADERS) - $(subst /,$(SEP),$(APINAMES_EXE)) -o$@ $(APINAMES_OPTIONS) $(PUBLIC_HEADERS) - @echo TT_New_Context >> $(EXPORTS_LIST) - @echo TT_RunIns >> $(EXPORTS_LIST) - - $(PROJECT_LIBRARY): $(EXPORTS_LIST) - - CLEAN += $(EXPORTS_LIST) \ - $(APINAMES_EXE) - -endif - - -# EOF diff --git a/freetype/freetype.mk b/freetype/freetype.mk @@ -1,20 +1,31 @@ TARG = freetype +DEPS = zlib libpng <$mkbuild/mk.common-noinst freetype:QV: - # build apinames for host (needed in build). - # TODO: possibly use CCraw="cc" CCexe="cc" CCexe_CFLAGS="" - # couldn't get that to work though. - #CC="cc" CFLAGS="" LDFLAGS="" make src/tools/apinames - cp ../fix_exports.mk builds/exports.mk - # - CC="$CC" ./configure --prefix="$prefix" --mandir="$ROOT/share/man" \ + # CCexe is set to build apinames for host (needed in build). +# export CFLAGS="$CFLAGS $DEPS_CFLAGS" +# export LDFLAGS="$LDFLAGS $DEPS_LDFLAGS" + export ZLIB_CFLAGS="-I${zlib_includedir}" + export ZLIB_LIBS="-L${zlib_libdir} -lzlib" + # needed because build system calls libpng-config. + export LIBPNG_CFLAGS="-I${libpng_includedir}" + export LIBPNG_LIBS="-L${libpng_libdir} -lpng16" + CC="$CC" ./configure \ + --prefix="$prefix" \ + --mandir="$ROOT/share/man" \ --disable-shared \ + --disable-nls \ --enable-static \ - --with-zlib - make -j$nprocs install DESTDIR="`pwd`/lib" + --with-zlib \ + --with-png + make -j$nprocs CCexe="${HOSTCC}" # DESTDIR="`pwd`/lib" + make -j$nprocs CCexe="${HOSTCC}" install DESTDIR="`pwd`/lib" # make symlink for includes, some packages depend on this (fontconfig). - ln -sf freetype2/freetype "`pwd`/lib/include/freetype" + mkdir -p "`pwd`/lib/include/freetype2/config" + ln -sf freetype2 "`pwd`/lib/include/freetype" + # fontconfig needs this. + ln -sf . "`pwd`/lib/include/freetype/freetype" # remove .la files for now ? find `pwd`/lib -iname "*.la" -exec rm {} \; diff --git a/freetype/v.mk b/freetype/v.mk @@ -1 +1 @@ -v = 2.4.11 +v = 2.5.3 diff --git a/libjpegturbo/libjpegturbo.mk b/libjpegturbo/libjpegturbo.mk @@ -4,14 +4,14 @@ TARG = libjpegturbo libjpegturbo:QV: CC="${CC} -static" ./configure \ - --prefix="$prefix" \ + --prefix="$prefix" \ --mandir="$ROOT/share/man" \ --disable-shared \ + --without-simd \ --enable-static \ --with-jpeg8 \ --includedir="/include/libjpeg-turbo" \ --libdir="/lib/libjpeg-turbo" \ - --without-simd \ --program-suffix=-turbo # make and install. make -j$nprocs install DESTDIR=`pwd`/lib diff --git a/libpng/depsinc.mk b/libpng/depsinc.mk @@ -1,6 +1,6 @@ <$libpng_DEPDIR/v.mk libpng_libdir = $libpng_DEPDIR/libpng-$v/lib/lib -libpng_includedir = $libpng_DEPDIR/libpng-$v/lib/include +libpng_includedir = $libpng_DEPDIR/libpng-$v/lib/include/libpng16 DEPS_CFLAGS = $DEPS_CFLAGS -I${libpng_includedir} -DEPS_LDFLAGS = $DEPS_LDFLAGS -L${libpng_libdir} -lpng +DEPS_LDFLAGS = $DEPS_LDFLAGS -L${libpng_libdir} -lpng16 diff --git a/libpthreadstubs/depsinc.mk b/libpthreadstubs/depsinc.mk @@ -0,0 +1,6 @@ +<$libpthreadstubs_DEPDIR/v.mk + +libpthreadstubs_libdir = $libpthreadstubs_DEPDIR/libpthread-stubs-$v/lib/lib +libpthreadstubs_includedir = $libpthreadstubs_DEPDIR/libpthread-stubs-$v/lib/include +DEPS_CFLAGS = $DEPS_CFLAGS -I${libpthreadstubs_includedir} +DEPS_LDFLAGS = $DEPS_LDFLAGS -L${libpthreadstubs_libdir} diff --git a/libpthreadstubs/libpthreadstubs.mk b/libpthreadstubs/libpthreadstubs.mk @@ -0,0 +1,14 @@ +TARG = libpthreadstubs + +<$mkbuild/mk.common-noinst + +libpthreadstubs:QV: + CC="$CC" ./configure \ + --prefix="$prefix" \ + --disable-shared \ + --enable-static + make -j$nprocs + # install lib for use as a dependency. + make -j$nprocs install DESTDIR=`pwd`/lib + # remove .la files for now ? + find `pwd`/lib -iname "*.la" -exec rm {} \; diff --git a/libpthreadstubs/mkfile b/libpthreadstubs/mkfile @@ -0,0 +1,6 @@ +<$mkbuild/mk.3rdparty + +<v.mk +src = libpthread-stubs-$v +url = http://xcb.freedesktop.org/dist/libpthread-stubs-$v.tar.bz2 +mkfile = ../libpthreadstubs.mk diff --git a/libpthreadstubs/v.mk b/libpthreadstubs/v.mk @@ -0,0 +1 @@ +v = 0.3 diff --git a/mupdf/mupdf.mk b/mupdf/mupdf.mk @@ -1,5 +1,6 @@ TARG = mupdf -DEPS = openssl xorglibx11 xorglibxext xorgxproto xorgxextproto xorglibxcb xorgxcbproto xorglibxau +DEPS = openssl xorglibx11 xorglibxext xorgxproto xorgxextproto \ + xorglibxcb xorgxcbproto xorglibxau xorglibxdmcp <$mkbuild/mk.common-noinst @@ -12,7 +13,7 @@ mupdf:QV: # (CROSSCOMPILE="yes" disables these in the normal build). mkdir -p generated build/${build} for tool in bin2hex cmapdump cquote fontdump; do - CC="cc" CFLAGS="" LDFLAGS="" make scripts/${tool} + CC="${HOSTCC}" CFLAGS="" LDFLAGS="" make scripts/${tool} cp "scripts/${tool}" "build/${build}" done # @@ -27,8 +28,8 @@ mupdf:QV: CROSSCOMPILE="yes" \ HAVE_X11="yes" \ HAVE_CURL="no" \ - X11_CFLAGS="-I${xorglibx11_includedir} -I${xorglibxext_includedir} -L${xorglibx11_libdir} -L${xorglibxext_libdir}" \ - X11_LIBS="-lX11 -lX11-xcb -lXext -lxcb -lXau" \ + X11_CFLAGS="${CFLAGS}" \ + X11_LIBS="${LDFLAGS}" \ OPENSSL_CFLAGS="-DHAVE_OPENSSL -I${openssl_includedir} -L${openssl_libdir}" \ OPENSSL_LIBS="-lcrypto -lssl" diff --git a/st/config.mk b/st/config.mk @@ -0,0 +1,13 @@ +# st version +VERSION = 0.5 + +# Customize below to fit your system + +# paths +PREFIX = /usr/local +MANPREFIX = ${PREFIX}/share/man + +# flags +CPPFLAGS = -DVERSION=\"${VERSION}\" -D_BSD_SOURCE -D_XOPEN_SOURCE=600 +CFLAGS += -std=c99 -pedantic -Wall -Wvariadic-macros ${CPPFLAGS} +#LDFLAGS += ${LIBS} diff --git a/st/mkfile b/st/mkfile @@ -0,0 +1,5 @@ +<$mkbuild/mk.3rdparty + +src = st +git = git://git.suckless.org/st +mkfile = ../st.mk diff --git a/st/st.mk b/st/st.mk @@ -0,0 +1,21 @@ +# make deps: tic (from ncurses). +TARG = st +DEPS = \ + fontconfig xorglibxft freetype expat xorglibxcb xorglibxext xorglibxrender \ + xorgrenderproto xorglibx11 xorgxtrans xorglibxcb xorgxcbproto xorgxproto \ + xorglibxau xorglibxdmcp libpng zlib + +<$mkbuild/mk.common-noinst + +st:QV: + export CFLAGS="$CFLAGS $DEPS_CFLAGS" + export LDFLAGS="$LDFLAGS $DEPS_LDFLAGS" + # overwrite default config.mk to allow overriding some variables. + cp ../config.mk config.mk + CC="${CC} -static" make -j$nprocs \ + PREFIX="$prefix" DESTDIR="$ROOT" + +install:QV: + # NOTE: set TERMINFO to force the proper path. + make -j$nprocs install PREFIX="$prefix" DESTDIR="$ROOT" \ + TERMINFO="$ROOT/share/terminfo" diff --git a/xorgbigreqsproto/depsinc.mk b/xorgbigreqsproto/depsinc.mk @@ -0,0 +1,7 @@ +<$xorgbigreqsproto_DEPDIR/v.mk + +xorgbigreqsproto_libdir = ${xorgbigreqsproto_DEPDIR}/bigreqsproto-$v/lib/lib +xorgbigreqsproto_includedir = ${xorgbigreqsproto_DEPDIR}/bigreqsproto-$v/lib/include + +DEPS_CFLAGS = $DEPS_CFLAGS -I${xorgbigreqsproto_includedir} +DEPS_LDFLAGS = $DEPS_LDFLAGS diff --git a/xorgbigreqsproto/mkfile b/xorgbigreqsproto/mkfile @@ -0,0 +1,6 @@ +<$mkbuild/mk.3rdparty + +<v.mk +src = bigreqsproto-$v +url = http://xorg.freedesktop.org/releases/individual/proto/bigreqsproto-$v.tar.bz2 +mkfile = ../xorgbigreqsproto.mk diff --git a/xorgbigreqsproto/v.mk b/xorgbigreqsproto/v.mk @@ -0,0 +1 @@ +v = 1.1.2 diff --git a/xorgbigreqsproto/xorgbigreqsproto.mk b/xorgbigreqsproto/xorgbigreqsproto.mk @@ -0,0 +1,10 @@ +TARG = xorgbigreqsproto + +<$mkbuild/mk.common-noinst + +xorgbigreqsproto:QV: + ./configure \ + --prefix="$prefix" \ + --mandir="$ROOT/share/man" + make -j$nprocs + make install DESTDIR="`pwd`/lib" diff --git a/xorgcompositeproto/depsinc.mk b/xorgcompositeproto/depsinc.mk @@ -0,0 +1,7 @@ +<$xorgcompositeproto_DEPDIR/v.mk + +xorgcompositeproto_libdir = ${xorgcompositeproto_DEPDIR}/compositeproto-$v/lib/lib +xorgcompositeproto_includedir = ${xorgcompositeproto_DEPDIR}/compositeproto-$v/lib/include + +DEPS_CFLAGS = $DEPS_CFLAGS -I${xorgcompositeproto_includedir} +DEPS_LDFLAGS = $DEPS_LDFLAGS diff --git a/xorgcompositeproto/mkfile b/xorgcompositeproto/mkfile @@ -0,0 +1,6 @@ +<$mkbuild/mk.3rdparty + +<v.mk +src = compositeproto-$v +url = http://xorg.freedesktop.org/releases/individual/proto/compositeproto-$v.tar.bz2 +mkfile = ../xorgcompositeproto.mk diff --git a/xorgcompositeproto/v.mk b/xorgcompositeproto/v.mk @@ -0,0 +1 @@ +v = 0.4.2 diff --git a/xorgcompositeproto/xorgcompositeproto.mk b/xorgcompositeproto/xorgcompositeproto.mk @@ -0,0 +1,10 @@ +TARG = xorgcompositeproto + +<$mkbuild/mk.common-noinst + +xorgcompositeproto:QV: + ./configure \ + --prefix="$prefix" \ + --mandir="$ROOT/share/man" + make -j$nprocs + make install DESTDIR="`pwd`/lib" diff --git a/xorgdamageproto/depsinc.mk b/xorgdamageproto/depsinc.mk @@ -0,0 +1,7 @@ +<$xorgdamageproto_DEPDIR/v.mk + +xorgdamageproto_libdir = ${xorgdamageproto_DEPDIR}/damageproto-$v/lib/lib +xorgdamageproto_includedir = ${xorgdamageproto_DEPDIR}/damageproto-$v/lib/include + +DEPS_CFLAGS = $DEPS_CFLAGS -I${xorgdamageproto_includedir} +DEPS_LDFLAGS = $DEPS_LDFLAGS diff --git a/xorgdamageproto/mkfile b/xorgdamageproto/mkfile @@ -0,0 +1,6 @@ +<$mkbuild/mk.3rdparty + +<v.mk +src = damageproto-$v +url = http://xorg.freedesktop.org/releases/individual/proto/damageproto-$v.tar.bz2 +mkfile = ../xorgdamageproto.mk diff --git a/xorgdamageproto/v.mk b/xorgdamageproto/v.mk @@ -0,0 +1 @@ +v = 1.2.1 diff --git a/xorgdamageproto/xorgdamageproto.mk b/xorgdamageproto/xorgdamageproto.mk @@ -0,0 +1,10 @@ +TARG = xorgdamageproto + +<$mkbuild/mk.common-noinst + +xorgdamageproto:QV: + ./configure \ + --prefix="$prefix" \ + --mandir="$ROOT/share/man" + make -j$nprocs + make install DESTDIR="`pwd`/lib" diff --git a/xorgdmxproto/depsinc.mk b/xorgdmxproto/depsinc.mk @@ -0,0 +1,7 @@ +<$xorgdmxproto_DEPDIR/v.mk + +xorgdmxproto_libdir = ${xorgdmxproto_DEPDIR}/dmxproto-$v/lib/lib +xorgdmxproto_includedir = ${xorgdmxproto_DEPDIR}/dmxproto-$v/lib/include + +DEPS_CFLAGS = $DEPS_CFLAGS -I${xorgdmxproto_includedir} +DEPS_LDFLAGS = $DEPS_LDFLAGS diff --git a/xorgdmxproto/mkfile b/xorgdmxproto/mkfile @@ -0,0 +1,6 @@ +<$mkbuild/mk.3rdparty + +<v.mk +src = dmxproto-$v +url = http://xorg.freedesktop.org/releases/individual/proto/dmxproto-$v.tar.bz2 +mkfile = ../xorgdmxproto.mk diff --git a/xorgdmxproto/v.mk b/xorgdmxproto/v.mk @@ -0,0 +1 @@ +v = 2.3.1 diff --git a/xorgdmxproto/xorgdmxproto.mk b/xorgdmxproto/xorgdmxproto.mk @@ -0,0 +1,10 @@ +TARG = xorgdmxproto + +<$mkbuild/mk.common-noinst + +xorgdmxproto:QV: + ./configure \ + --prefix="$prefix" \ + --mandir="$ROOT/share/man" + make -j$nprocs + make install DESTDIR="`pwd`/lib" diff --git a/xorgdri2proto/depsinc.mk b/xorgdri2proto/depsinc.mk @@ -0,0 +1,6 @@ +<$xorgdri2proto_DEPDIR/v.mk + +xorgdri2proto_libdir = $xorgdri2proto_DEPDIR/dri2proto-$v/lib/lib +xorgdri2proto_includedir = $xorgdri2proto_DEPDIR/dri2proto-$v/lib/include +DEPS_CFLAGS = $DEPS_CFLAGS -I${xorgdri2proto_includedir} +DEPS_LDFLAGS = $DEPS_LDFLAGS -L${xorgdri2proto_libdir} diff --git a/xorgdri2proto/mkfile b/xorgdri2proto/mkfile @@ -0,0 +1,6 @@ +<$mkbuild/mk.3rdparty + +<v.mk +src = dri2proto-$v +url = http://xorg.freedesktop.org/releases/individual/proto/dri2proto-$v.tar.bz2 +mkfile = ../xorgdri2proto.mk diff --git a/xorgdri2proto/v.mk b/xorgdri2proto/v.mk @@ -0,0 +1 @@ +v = 2.8 diff --git a/xorgdri2proto/xorgdri2proto.mk b/xorgdri2proto/xorgdri2proto.mk @@ -0,0 +1,15 @@ +TARG = xorgdri2proto + +<$mkbuild/mk.common-noinst + +xorgdri2proto:QV: + CC="$CC" ./configure \ + --prefix="$prefix" \ + --mandir="$ROOT/share/man" \ + --disable-shared \ + --enable-static + make -j$nprocs + # install lib for use as a dependency. + make -j$nprocs install DESTDIR=`pwd`/lib + # remove .la files for now ? + find `pwd`/lib -iname "*.la" -exec rm {} \; diff --git a/xorgfixesproto/depsinc.mk b/xorgfixesproto/depsinc.mk @@ -0,0 +1,7 @@ +<$xorgfixesproto_DEPDIR/v.mk + +xorgfixesproto_libdir = ${xorgfixesproto_DEPDIR}/fixesproto-$v/lib/lib +xorgfixesproto_includedir = ${xorgfixesproto_DEPDIR}/fixesproto-$v/lib/include + +DEPS_CFLAGS = $DEPS_CFLAGS -I${xorgfixesproto_includedir} +DEPS_LDFLAGS = $DEPS_LDFLAGS diff --git a/xorgfixesproto/mkfile b/xorgfixesproto/mkfile @@ -0,0 +1,6 @@ +<$mkbuild/mk.3rdparty + +<v.mk +src = fixesproto-$v +url = http://xorg.freedesktop.org/releases/individual/proto/fixesproto-$v.tar.bz2 +mkfile = ../xorgfixesproto.mk diff --git a/xorgfixesproto/v.mk b/xorgfixesproto/v.mk @@ -0,0 +1 @@ +v = 5.0 diff --git a/xorgfixesproto/xorgfixesproto.mk b/xorgfixesproto/xorgfixesproto.mk @@ -0,0 +1,10 @@ +TARG = xorgfixesproto + +<$mkbuild/mk.common-noinst + +xorgfixesproto:QV: + ./configure \ + --prefix="$prefix" \ + --mandir="$ROOT/share/man" + make -j$nprocs + make install DESTDIR="`pwd`/lib" diff --git a/xorgfontsproto/depsinc.mk b/xorgfontsproto/depsinc.mk @@ -0,0 +1,7 @@ +<$xorgfontsproto_DEPDIR/v.mk + +xorgfontsproto_libdir = ${xorgfontsproto_DEPDIR}/fontsproto-$v/lib/lib +xorgfontsproto_includedir = ${xorgfontsproto_DEPDIR}/fontsproto-$v/lib/include + +DEPS_CFLAGS = $DEPS_CFLAGS -I${xorgfontsproto_includedir} +DEPS_LDFLAGS = $DEPS_LDFLAGS diff --git a/xorgfontsproto/mkfile b/xorgfontsproto/mkfile @@ -0,0 +1,6 @@ +<$mkbuild/mk.3rdparty + +<v.mk +src = fontsproto-$v +url = http://xorg.freedesktop.org/releases/individual/proto/fontsproto-$v.tar.bz2 +mkfile = ../xorgfontsproto.mk diff --git a/xorgfontsproto/v.mk b/xorgfontsproto/v.mk @@ -0,0 +1 @@ +v = 2.1.3 diff --git a/xorgfontsproto/xorgfontsproto.mk b/xorgfontsproto/xorgfontsproto.mk @@ -0,0 +1,10 @@ +TARG = xorgfontsproto + +<$mkbuild/mk.common-noinst + +xorgfontsproto:QV: + ./configure \ + --prefix="$prefix" \ + --mandir="$ROOT/share/man" + make -j$nprocs + make install DESTDIR="`pwd`/lib" diff --git a/xorglibfontenc/depsinc.mk b/xorglibfontenc/depsinc.mk @@ -0,0 +1,7 @@ +<$xorglibfontenc_DEPDIR/v.mk + +xorglibfontenc_includedir = ${xorglibfontenc_DEPDIR}/libfontenc-$v/lib/include +xorglibfontenc_libdir = ${xorglibfontenc_DEPDIR}/libfontenc-$v/lib/lib + +DEPS_CFLAGS = $DEPS_CFLAGS -I${xorglibfontenc_includedir} +DEPS_LDFLAGS = $DEPS_LDFLAGS -L${xorglibfontenc_libdir} -lfontenc diff --git a/xorglibfontenc/mkfile b/xorglibfontenc/mkfile @@ -0,0 +1,6 @@ +<$mkbuild/mk.3rdparty + +<v.mk +src = libfontenc-$v +url = http://xorg.freedesktop.org/releases/individual/lib/libfontenc-$v.tar.bz2 +mkfile = ../xorglibfontenc.mk diff --git a/xorglibfontenc/v.mk b/xorglibfontenc/v.mk @@ -0,0 +1 @@ +v = 1.1.2 diff --git a/xorglibfontenc/xorglibfontenc.mk b/xorglibfontenc/xorglibfontenc.mk @@ -0,0 +1,18 @@ +TARG = xorglibfontenc +DEPS = zlib xorgxproto + +<$mkbuild/mk.common-noinst + +xorglibfontenc:QV: + export CFLAGS="$CFLAGS $DEPS_CFLAGS" + export LDFLAGS="$LDFLAGS $DEPS_LDFLAGS" + export FONTENC_CFLAGS=" " + export FONTENC_LIBS=" " + CC="$CC" ./configure \ + --prefix="$prefix" \ + --mandir="$ROOT/share/man" \ + --disable-shared \ + --enable-static + make -j$nprocs DESTDIR="`pwd`/lib/" install + # remove .la files for now ? + find `pwd`/lib -iname "*.la" -exec rm {} \; diff --git a/xorglibpciaccess/depsinc.mk b/xorglibpciaccess/depsinc.mk @@ -0,0 +1,6 @@ +<$xorglibpciaccess_DEPDIR/v.mk + +xorglibpciaccess_libdir = $xorglibpciaccess_DEPDIR/libpciaccess-$v/lib/lib +xorglibpciaccess_includedir = $xorglibpciaccess_DEPDIR/libpciaccess-$v/lib/include +DEPS_CFLAGS = $DEPS_CFLAGS -I${xorglibpciaccess_includedir} +DEPS_LDFLAGS = $DEPS_LDFLAGS -L${xorglibpciaccess_libdir} -lpciaccess diff --git a/xorglibpciaccess/limits.patch b/xorglibpciaccess/limits.patch @@ -0,0 +1,10 @@ +--- src/linux_sysfs.old 2014-05-14 15:00:00.932500323 +0200 ++++ src/linux_sysfs.c 2014-05-14 15:00:57.252498017 +0200 +@@ -44,6 +44,7 @@ + #include <sys/mman.h> + #include <dirent.h> + #include <errno.h> ++#include <limits.h> + + #if defined(__i386__) || defined(__x86_64__) || defined(__arm__) + #include <sys/io.h> diff --git a/xorglibpciaccess/mkfile b/xorglibpciaccess/mkfile @@ -0,0 +1,6 @@ +<$mkbuild/mk.3rdparty + +<v.mk +src = libpciaccess-$v +url = http://xorg.freedesktop.org/releases/individual/lib/libpciaccess-$v.tar.bz2 +mkfile = ../xorglibpciaccess.mk diff --git a/xorglibpciaccess/v.mk b/xorglibpciaccess/v.mk @@ -0,0 +1 @@ +v = 0.13.2 diff --git a/xorglibpciaccess/xorglibpciaccess.mk b/xorglibpciaccess/xorglibpciaccess.mk @@ -0,0 +1,21 @@ +TARG = xorglibpciaccess +DEPS = zlib + +<$mkbuild/mk.common-noinst + +xorglibpciaccess:QV: + export CFLAGS="$CFLAGS $DEPS_CFLAGS" + export LDFLAGS="$LDFLAGS $DEPS_LDFLAGS" + # fix missing include for limits.h (PATH_MAX). + patch -p0 < ../limits.patch + CC="$CC" ./configure \ + --prefix="$prefix" \ + --mandir="$ROOT/share/man" \ + --with-zlib \ + --disable-shared \ + --enable-static + make -j$nprocs + # install lib for use as a dependency. + make -j$nprocs install DESTDIR=`pwd`/lib + # remove .la files for now ? + find `pwd`/lib -iname "*.la" -exec rm {} \; diff --git a/xorglibpixman/depsinc.mk b/xorglibpixman/depsinc.mk @@ -0,0 +1,6 @@ +<$xorglibpixman_DEPDIR/v.mk + +xorglibpixman_libdir = $xorglibpixman_DEPDIR/pixman-$v/lib/lib +xorglibpixman_includedir = $xorglibpixman_DEPDIR/pixman-$v/lib/include/pixman-1 +DEPS_CFLAGS = $DEPS_CFLAGS -I${xorglibpixman_includedir} +DEPS_LDFLAGS = $DEPS_LDFLAGS -L${xorglibpixman_libdir} -lpixman-1 diff --git a/xorglibpixman/mkfile b/xorglibpixman/mkfile @@ -0,0 +1,6 @@ +<$mkbuild/mk.3rdparty + +<v.mk +src = pixman-$v +url = http://xorg.freedesktop.org/releases/individual/lib/pixman-$v.tar.bz2 +mkfile = ../xorglibpixman.mk diff --git a/xorglibpixman/v.mk b/xorglibpixman/v.mk @@ -0,0 +1 @@ +v = 0.32.4 diff --git a/xorglibpixman/xorglibpixman.mk b/xorglibpixman/xorglibpixman.mk @@ -0,0 +1,24 @@ +# Description: Pixel manipulation library +# Deps: libpng +# Indirect deps: zlib (libpng). +TARG = xorglibpixman +DEPS = zlib libpng + +<$mkbuild/mk.common-noinst + +xorglibpixman:QV: + export CFLAGS="$CFLAGS $DEPS_CFLAGS" + export LDFLAGS="$LDFLAGS $DEPS_LDFLAGS" + export PNG_CFLAGS="-I${libpng_includedir}" + export PNG_LIBS="-L${libpng_libdir} -lpng16 -lm -lz" + CC="$CC" ./configure \ + --prefix="$prefix" \ + --mandir="$ROOT/share/man" \ + --disable-shared \ + --enable-static \ + --enable-libpng + make -j$nprocs + # install lib for use as a dependency. + make -j$nprocs install DESTDIR=`pwd`/lib + # remove .la files for now ? + find `pwd`/lib -iname "*.la" -exec rm {} \; diff --git a/xorglibx11/makekeys b/xorglibx11/makekeys Binary files differ. diff --git a/xorglibx11/makekeys_Makefile b/xorglibx11/makekeys_Makefile @@ -1,5 +1,5 @@ all: - cc makekeys.c -o makekeys -static + $(HOSTCC) makekeys.c -o makekeys -static -I../../include $(HOSTCC_CFLAGS) install: true uninstall: diff --git a/xorglibx11/xorglibx11.mk b/xorglibx11/xorglibx11.mk @@ -1,14 +1,21 @@ TARG = xorglibx11 -DEPS = xorgxproto xorgxtrans xorglibxcb xorgkbproto xorginputproto +DEPS = xorgxproto xorglibxcb xorgxcbproto xorgkbproto xorginputproto xorgxf86bigfontproto xorgxtrans <$mkbuild/mk.common-noinst xorglibx11:QV: export CFLAGS="$CFLAGS $DEPS_CFLAGS" export LDFLAGS="$LDFLAGS $DEPS_LDFLAGS" + # set these to make sure these are used. + export BIGFONT_CFLAGS="-I${xorgxf86bigfontproto_includedir}" + export BIGFONT_LIBS="-L${xorgxf86bigfontproto_libdir}" + export X11_CFLAGS="${CFLAGS}" + export X11_LIBS="${LDFLAGS}" + #TODO: more detailed flags +# export X11_CFLAGS="-I${xorgxproto_includedir}" +# export X11_LIBS="-L${xorgxproto_libdir}" ./configure --prefix="$prefix" \ --mandir="$ROOT/share/man" \ - --disable-loadable-xcursor \ --with-keysymdefdir="${xorgxproto_includedir}/X11" \ --disable-shared \ --enable-static @@ -16,6 +23,7 @@ xorglibx11:QV: # build makekeys staticly. cp ../makekeys_Makefile src/util/Makefile # make and install. + export HOSTCC_CFLAGS="-I${xorgxproto_includedir}" make -j$nprocs install DESTDIR=`pwd`/lib # remove .la files for now ? find `pwd`/lib -iname "*.la" -exec rm {} \; diff --git a/xorglibxau/xorglibxau.mk b/xorglibxau/xorglibxau.mk @@ -6,5 +6,11 @@ DEPS = xorgxproto xorglibxau:QV: export CFLAGS="$CFLAGS $DEPS_CFLAGS" export LDFLAGS="$LDFLAGS $DEPS_LDFLAGS" - CC="$CC" ./configure --prefix="$prefix" --mandir="$ROOT/share/man" + export XAU_CFLAGS="-I${xorgxproto_includedir}" + export XAU_LIBS="-L${xorgxproto_libdir}" + CC="$CC" ./configure \ + --prefix="$prefix" \ + --mandir="$ROOT/share/man" make -j$nprocs DESTDIR="`pwd`/lib/" install + # remove .la files for now ? + find `pwd`/lib -iname "*.la" -exec rm {} \; diff --git a/xorglibxcb/xorglibxcb.mk b/xorglibxcb/xorglibxcb.mk @@ -1,6 +1,6 @@ # make deps: python2.7 (with python 3 won't work atm (2014-04-30)). TARG = xorglibxcb -DEPS = xorgxcbproto xorglibxau xorgxproto +DEPS = xorgxcbproto xorgxproto xorglibxau xorglibxdmcp <$mkbuild/mk.common-noinst @@ -8,8 +8,15 @@ xorglibxcb:QV: export CFLAGS="$CFLAGS $DEPS_CFLAGS" export LDFLAGS="$LDFLAGS $DEPS_LDFLAGS" export PYTHON="python2.7" - # stfu - export PKG_CONFIG="/bin/true" + export XCBPROTO_CFLAGS="-I${xorgxcbproto_includedir}" + export XCBPROTO_LIBS="-L${xorgxcbproto_libdir}" + export XDMCP_CFLAGS="-I${xorglibxdmcp_includedir}" + export XDMCP_LIBS="-L${xorglibxdmcp_libdir}" + export NEEDED_CFLAGS="${CFLAGS}" + export NEEDED_LIBS="${LDFLAGS}" + # TODO: better flags. +# export NEEDED_CFLAGS="-I${xorgxproto_includedir}" +# export NEEDED_LIBS="-L${xorgxproto_libdir}" ./configure \ --prefix="$prefix" \ --mandir="$ROOT/share/man" \ diff --git a/xorglibxdmcp/depsinc.mk b/xorglibxdmcp/depsinc.mk @@ -0,0 +1,7 @@ +<$xorglibxdmcp_DEPDIR/v.mk + +xorglibxdmcp_includedir = ${xorglibxdmcp_DEPDIR}/libXdmcp-$v/lib/include +xorglibxdmcp_libdir = ${xorglibxdmcp_DEPDIR}/libXdmcp-$v/lib/lib + +DEPS_CFLAGS = $DEPS_CFLAGS -I${xorglibxdmcp_includedir} +DEPS_LDFLAGS = $DEPS_LDFLAGS -L${xorglibxdmcp_libdir} -lXdmcp diff --git a/xorglibxdmcp/mkfile b/xorglibxdmcp/mkfile @@ -0,0 +1,6 @@ +<$mkbuild/mk.3rdparty + +<v.mk +src = libXdmcp-$v +url = http://xorg.freedesktop.org/releases/individual/lib/libXdmcp-$v.tar.bz2 +mkfile = ../xorglibxdmcp.mk diff --git a/xorglibxdmcp/v.mk b/xorglibxdmcp/v.mk @@ -0,0 +1 @@ +v = 1.1.1 diff --git a/xorglibxdmcp/xorglibxdmcp.mk b/xorglibxdmcp/xorglibxdmcp.mk @@ -0,0 +1,21 @@ +TARG = xorglibxdmcp +DEPS = xorgxproto + +<$mkbuild/mk.common-noinst + +xorglibxdmcp:QV: + export CFLAGS="$CFLAGS $DEPS_CFLAGS" + export LDFLAGS="$LDFLAGS $DEPS_LDFLAGS" + export XDMCP_CFLAGS="-I${xorgxproto_includedir}" + export XDMCP_LIBS="-L${xorgxproto_libdir}" + # HAVE__XEATDATAWORDS is set, but it isn't detected with configure + # set set it. +# CC="$CC" CFLAGS="$CFLAGS -DHAVE__XEATDATAWORDS=1" ./configure + CC="$CC" ./configure \ + --prefix="$prefix" \ + --mandir="$ROOT/share/man" \ + --disable-shared \ + --enable-static + make -j$nprocs DESTDIR="`pwd`/lib/" install + # remove .la files for now ? + find `pwd`/lib -iname "*.la" -exec rm {} \; diff --git a/xorglibxext/xorglibxext.mk b/xorglibxext/xorglibxext.mk @@ -6,6 +6,8 @@ DEPS = xorglibx11 xorgxproto xorgxextproto xorglibxau xorglibxext:QV: export CFLAGS="$CFLAGS $DEPS_CFLAGS" export LDFLAGS="$LDFLAGS $DEPS_LDFLAGS" + export XEXT_CFLAGS="-I${xorgxextproto_libdir}" + export XEXT_LIBS="-L${xorgxextproto_libdir}" # HAVE__XEATDATAWORDS is set, but it isn't detected with configure # set set it. CC="$CC" CFLAGS="$CFLAGS -DHAVE__XEATDATAWORDS=1" ./configure \ diff --git a/xorglibxfont/depsinc.mk b/xorglibxfont/depsinc.mk @@ -0,0 +1,6 @@ +<$xorglibxfont_DEPDIR/v.mk + +xorglibxfont_libdir = $xorglibxfont_DEPDIR/libXfont-$v/lib/lib +xorglibxfont_includedir = $xorglibxfont_DEPDIR/libXfont-$v/lib/include +DEPS_CFLAGS = $DEPS_CFLAGS -I${xorglibxfont_includedir} +DEPS_LDFLAGS = $DEPS_LDFLAGS -L${xorglibxfont_libdir} -lXfont diff --git a/xorglibxfont/mkfile b/xorglibxfont/mkfile @@ -0,0 +1,6 @@ +<$mkbuild/mk.3rdparty + +<v.mk +src = libXfont-$v +url = http://xorg.freedesktop.org/releases/individual/lib/libXfont-$v.tar.bz2 +mkfile = ../xorglibxfont.mk diff --git a/xorglibxfont/v.mk b/xorglibxfont/v.mk @@ -0,0 +1 @@ +v = 1.4.7 diff --git a/xorglibxfont/xorg-libxfont-const.diff b/xorglibxfont/xorg-libxfont-const.diff @@ -0,0 +1,21 @@ +diff -urN libXfont-1.4.7.orig/src/util/patcache.c libXfont-1.4.7/src/util/patcache.c +--- libXfont-1.4.7.orig/src/util/patcache.c 2014-01-07 10:25:08.000000000 -0600 ++++ libXfont-1.4.7/src/util/patcache.c 2014-04-19 13:28:51.509242842 -0500 +@@ -128,7 +128,7 @@ + /* add entry */ + void + CacheFontPattern (FontPatternCachePtr cache, +- char *pattern, ++ const char *pattern, + int patlen, + FontPtr pFont) + { +@@ -174,7 +174,7 @@ + /* find matching entry */ + FontPtr + FindCachedFontPattern (FontPatternCachePtr cache, +- char *pattern, ++ const char *pattern, + int patlen) + { + int hash; diff --git a/xorglibxfont/xorglibxfont.mk b/xorglibxfont/xorglibxfont.mk @@ -0,0 +1,22 @@ +TARG = xorglibxfont +DEPS = freetype zlib xorgxproto xorglibfontenc xorgxtrans xorgfontsproto + +<$mkbuild/mk.common-noinst + +xorglibxfont:QV: + # patch "error: conflicting types for ‘CacheFontPattern’" + patch -p1 -i ../xorg-libxfont-const.diff + # + export CFLAGS="$CFLAGS $DEPS_CFLAGS" + export LDFLAGS="$LDFLAGS $DEPS_LDFLAGS" + export FREETYPE_CFLAGS="-I${freetype_includedir}" + export FREETYPE_LIBS="-L${freetype_libdir} -lfreetype" + export XFONT_CFLAGS=" " + export XFONT_LIBS=" " + CC="$CC" ./configure \ + --prefix="$prefix" --mandir="$ROOT/share/man" \ + --disable-shared \ + --enable-static + make -j$nprocs install DESTDIR="`pwd`/lib" + # remove .la files for now ? + find `pwd`/lib -iname "*.la" -exec rm {} \; diff --git a/xorglibxft/xorglibxft.mk b/xorglibxft/xorglibxft.mk @@ -6,7 +6,23 @@ DEPS = xorglibx11 xorgxproto freetype fontconfig xorglibxrender xorgrenderproto xorglibxft:QV: export CFLAGS="$CFLAGS $DEPS_CFLAGS" export LDFLAGS="$LDFLAGS $DEPS_LDFLAGS" - CC="$CC" ./configure --prefix="$prefix" --mandir="$ROOT/share/man" \ + #export XRENDER_CFLAGS="-I${xorglibxrender_includedir}" + #export XRENDER_LIBS="-lX11 -lXrender -lxcb -lXau -lXdmcp -L${xorglibxrender_libdir}" + export XRENDER_CFLAGS="${CFLAGS}" + export XRENDER_LIBS="${LDFLAGS}" + # include dir is "freetype" not "freetype2". + export FREETYPE_CFLAGS="-I${freetype_includedir}../" +# export FREETYPE_LIBS="-lfreetype -L${freetype_libdir}" + export FREETYPE_LIBS="${LDFLAGS}" + export FONTCONFIG_CFLAGS="${CFLAGS}" + export FONTCONFIG_LIBS="${LDFLAGS}" + #export FONTCONFIG_CFLAGS="-I${fontconfig_includedir}" + #export FONTCONFIG_LIBS="-lfontconfig -L${fontconfig_libdir}" + CC="$CC" ./configure \ + --prefix="$prefix" \ + --mandir="$ROOT/share/man" \ --disable-shared \ --enable-static make -j$nprocs install DESTDIR="`pwd`/lib" + # remove .la files for now ? + find `pwd`/lib -iname "*.la" -exec rm {} \; diff --git a/xorglibxinerama/xorglibxinerama.mk b/xorglibxinerama/xorglibxinerama.mk @@ -6,6 +6,8 @@ DEPS = xorglibx11 xorgxproto xorglibxext xorgxineramaproto xorglibxau xorglibxinerama:QV: export CFLAGS="$CFLAGS $DEPS_CFLAGS" export LDFLAGS="$LDFLAGS $DEPS_LDFLAGS" + export XINERAMA_CFLAGS="-I${xorgxineramaproto_includedir}" + export XINERAMA_LIBS="-L${xorgxineramaproto_libdir}" # HAVE__XEATDATAWORDS is set, but it isn't detected with configure # set set it. CC="$CC" CFLAGS="$CFLAGS -DHAVE__XEATDATAWORDS=1" ./configure \ @@ -14,3 +16,5 @@ xorglibxinerama:QV: --disable-shared \ --enable-static make -j$nprocs DESTDIR="`pwd`/lib/" install + # remove .la files for now ? + find `pwd`/lib -iname "*.la" -exec rm {} \; diff --git a/xorglibxkbfile/depsinc.mk b/xorglibxkbfile/depsinc.mk @@ -0,0 +1,7 @@ +<$xorglibxkbfile_DEPDIR/v.mk + +xorglibxkbfile_includedir = ${xorglibxkbfile_DEPDIR}/libxkbfile-$v/lib/include +xorglibxkbfile_libdir = ${xorglibxkbfile_DEPDIR}/libxkbfile-$v/lib/lib + +DEPS_CFLAGS = $DEPS_CFLAGS -I${xorglibxkbfile_includedir} +DEPS_LDFLAGS = $DEPS_LDFLAGS -L${xorglibxkbfile_libdir} -lxkbfile diff --git a/xorglibxkbfile/mkfile b/xorglibxkbfile/mkfile @@ -0,0 +1,6 @@ +<$mkbuild/mk.3rdparty + +<v.mk +src = libxkbfile-$v +url = http://xorg.freedesktop.org/releases/individual/lib/libxkbfile-$v.tar.bz2 +mkfile = ../xorglibxkbfile.mk diff --git a/xorglibxkbfile/v.mk b/xorglibxkbfile/v.mk @@ -0,0 +1 @@ +v = 1.0.8 diff --git a/xorglibxkbfile/xorglibxkbfile.mk b/xorglibxkbfile/xorglibxkbfile.mk @@ -0,0 +1,16 @@ +TARG = xorglibxkbfile +DEPS = xorgkbproto xorgxproto xorglibx11 + +<$mkbuild/mk.common-noinst + +xorglibxkbfile:QV: + export CFLAGS="$CFLAGS $DEPS_CFLAGS" + export LDFLAGS="$LDFLAGS $DEPS_LDFLAGS" + export XKBFILE_CFLAGS="-I${xorgkbproto_includedir}" + export XKBFILE_LIBS="-L${xorgkbproto_libdir}" + CC="$CC" ./configure \ + --prefix="$prefix" \ + --mandir="$ROOT/share/man" + make -j$nprocs DESTDIR="`pwd`/lib/" install + # remove .la files for now ? + find `pwd`/lib -iname "*.la" -exec rm {} \; diff --git a/xorglibxrender/xorglibxrender.mk b/xorglibxrender/xorglibxrender.mk @@ -6,6 +6,9 @@ DEPS = xorglibx11 xorgxproto xorgrenderproto xorglibxrender:QV: export CFLAGS="$CFLAGS $DEPS_CFLAGS" export LDFLAGS="$LDFLAGS $DEPS_LDFLAGS" + # TODO: includedir, libdir is a bug? + export RENDER_CFLAGS="-I${xorgrenderproto_libdir}" + export RENDER_LIBS="-L${xorgrenderproto_libdir}" # HAVE__XEATDATAWORDS is set, but it isn't detected with configure # set set it. CC="$CC" CFLAGS="$CFLAGS -DHAVE__XEATDATAWORDS=1" ./configure \ diff --git a/xorgrandrproto/depsinc.mk b/xorgrandrproto/depsinc.mk @@ -0,0 +1,7 @@ +<$xorgrandrproto_DEPDIR/v.mk + +xorgrandrproto_libdir = ${xorgrandrproto_DEPDIR}/randrproto-$v/lib/lib +xorgrandrproto_includedir = ${xorgrandrproto_DEPDIR}/randrproto-$v/lib/include + +DEPS_CFLAGS = $DEPS_CFLAGS -I${xorgrandrproto_includedir} +DEPS_LDFLAGS = $DEPS_LDFLAGS diff --git a/xorgrandrproto/mkfile b/xorgrandrproto/mkfile @@ -0,0 +1,6 @@ +<$mkbuild/mk.3rdparty + +<v.mk +src = randrproto-$v +url = http://xorg.freedesktop.org/releases/individual/proto/randrproto-$v.tar.bz2 +mkfile = ../xorgrandrproto.mk diff --git a/xorgrandrproto/v.mk b/xorgrandrproto/v.mk @@ -0,0 +1 @@ +v = 1.4.0 diff --git a/xorgrandrproto/xorgrandrproto.mk b/xorgrandrproto/xorgrandrproto.mk @@ -0,0 +1,10 @@ +TARG = xorgrandrproto + +<$mkbuild/mk.common-noinst + +xorgrandrproto:QV: + ./configure \ + --prefix="$prefix" \ + --mandir="$ROOT/share/man" + make -j$nprocs + make install DESTDIR="`pwd`/lib" diff --git a/xorgrecordproto/depsinc.mk b/xorgrecordproto/depsinc.mk @@ -0,0 +1,7 @@ +<$xorgrecordproto_DEPDIR/v.mk + +xorgrecordproto_libdir = ${xorgrecordproto_DEPDIR}/recordproto-$v/lib/lib +xorgrecordproto_includedir = ${xorgrecordproto_DEPDIR}/recordproto-$v/lib/include + +DEPS_CFLAGS = $DEPS_CFLAGS -I${xorgrecordproto_includedir} +DEPS_LDFLAGS = $DEPS_LDFLAGS diff --git a/xorgrecordproto/mkfile b/xorgrecordproto/mkfile @@ -0,0 +1,6 @@ +<$mkbuild/mk.3rdparty + +<v.mk +src = recordproto-$v +url = http://xorg.freedesktop.org/releases/individual/proto/recordproto-$v.tar.bz2 +mkfile = ../xorgrecordproto.mk diff --git a/xorgrecordproto/v.mk b/xorgrecordproto/v.mk @@ -0,0 +1 @@ +v = 1.14.2 diff --git a/xorgrecordproto/xorgrecordproto.mk b/xorgrecordproto/xorgrecordproto.mk @@ -0,0 +1,10 @@ +TARG = xorgrecordproto + +<$mkbuild/mk.common-noinst + +xorgrecordproto:QV: + ./configure \ + --prefix="$prefix" \ + --mandir="$ROOT/share/man" + make -j$nprocs + make install DESTDIR="`pwd`/lib" diff --git a/xorgresourceproto/depsinc.mk b/xorgresourceproto/depsinc.mk @@ -0,0 +1,7 @@ +<$xorgresourceproto_DEPDIR/v.mk + +xorgresourceproto_libdir = ${xorgresourceproto_DEPDIR}/resourceproto-$v/lib/lib +xorgresourceproto_includedir = ${xorgresourceproto_DEPDIR}/resourceproto-$v/lib/include + +DEPS_CFLAGS = $DEPS_CFLAGS -I${xorgresourceproto_includedir} +DEPS_LDFLAGS = $DEPS_LDFLAGS diff --git a/xorgresourceproto/mkfile b/xorgresourceproto/mkfile @@ -0,0 +1,6 @@ +<$mkbuild/mk.3rdparty + +<v.mk +src = resourceproto-$v +url = http://xorg.freedesktop.org/releases/individual/proto/resourceproto-$v.tar.bz2 +mkfile = ../xorgresourceproto.mk diff --git a/xorgresourceproto/v.mk b/xorgresourceproto/v.mk @@ -0,0 +1 @@ +v = 1.2.0 diff --git a/xorgresourceproto/xorgresourceproto.mk b/xorgresourceproto/xorgresourceproto.mk @@ -0,0 +1,10 @@ +TARG = xorgresourceproto + +<$mkbuild/mk.common-noinst + +xorgresourceproto:QV: + ./configure \ + --prefix="$prefix" \ + --mandir="$ROOT/share/man" + make -j$nprocs + make install DESTDIR="`pwd`/lib" diff --git a/xorgscrnsaverproto/depsinc.mk b/xorgscrnsaverproto/depsinc.mk @@ -0,0 +1,7 @@ +<$xorgscrnsaverproto_DEPDIR/v.mk + +xorgscrnsaverproto_libdir = ${xorgscrnsaverproto_DEPDIR}/scrnsaverproto-$v/lib/lib +xorgscrnsaverproto_includedir = ${xorgscrnsaverproto_DEPDIR}/scrnsaverproto-$v/lib/include + +DEPS_CFLAGS = $DEPS_CFLAGS -I${xorgscrnsaverproto_includedir} +DEPS_LDFLAGS = $DEPS_LDFLAGS diff --git a/xorgscrnsaverproto/mkfile b/xorgscrnsaverproto/mkfile @@ -0,0 +1,6 @@ +<$mkbuild/mk.3rdparty + +<v.mk +src = scrnsaverproto-$v +url = http://xorg.freedesktop.org/releases/individual/proto/scrnsaverproto-$v.tar.bz2 +mkfile = ../xorgscrnsaverproto.mk diff --git a/xorgscrnsaverproto/v.mk b/xorgscrnsaverproto/v.mk @@ -0,0 +1 @@ +v = 1.2.2 diff --git a/xorgscrnsaverproto/xorgscrnsaverproto.mk b/xorgscrnsaverproto/xorgscrnsaverproto.mk @@ -0,0 +1,10 @@ +TARG = xorgscrnsaverproto + +<$mkbuild/mk.common-noinst + +xorgscrnsaverproto:QV: + ./configure \ + --prefix="$prefix" \ + --mandir="$ROOT/share/man" + make -j$nprocs + make install DESTDIR="`pwd`/lib" diff --git a/xorgserver/mkfile b/xorgserver/mkfile @@ -0,0 +1,6 @@ +<$mkbuild/mk.3rdparty + +<v.mk +src = xorg-server-$v +url = http://xorg.freedesktop.org/releases/individual/xserver/xorg-server-$v.tar.bz2 +mkfile = ../xorgserver.mk diff --git a/xorgserver/v.mk b/xorgserver/v.mk @@ -0,0 +1 @@ +v = 1.14.6 diff --git a/xorgserver/xorgserver.mk b/xorgserver/xorgserver.mk @@ -0,0 +1,66 @@ +# openssl is used for --with-sha1=libcrypto +TARG = xorgserver +DEPS = xorglibpixman xorglibx11 openssl xorglibpciaccess \ + xorgxproto xorginputproto xorgxextproto xorgxineramaproto \ + xorgresourceproto xorgscrnsaverproto xorgkbproto xorgvideoproto \ + xorgfontsproto xorgrenderproto xorgdamageproto xorgfixesproto \ + xorgcompositeproto xorgbigreqsproto xorgxcmiscproto \ + xorgrecordproto xorglibxau xorgrandrproto xorglibxkbfile \ + xorgxtrans xorglibxfont freetype xorglibfontenc libpng zlib + +<$mkbuild/mk.common-noinst + +xorgserver:QV: + # fix termio.h -> termios.h + sed 's@termio.h@termios.h@g' -i 'hw/xfree86/os-support/xf86_OSlib.h' + # fix __uid_t and __gid_t + sed 's@__uid_t@uid_t@g' -i 'hw/kdrive/linux/linux.c' + sed 's@__gid_t@gid_t@g' -i 'hw/kdrive/linux/linux.c' + # dont build tests. + printf "all:\n\ttrue\n\ninstall:\n\ttrue\n\n" > test/Makefile.in + # + export CFLAGS="$CFLAGS $DEPS_CFLAGS" + export LDFLAGS="$LDFLAGS $DEPS_LDFLAGS" + export CPPFLAGS="$CFLAGS" + export PCIACCESS_CFLAGS="-I${xorglibpciaccess_includedir}" + export PCIACCESS_LIBS="-L${xorglibpciaccess_libdir} -lpciaccess" + export PIXMAN_CFLAGS="-I${xorglibpixman_includedir}" + export PIXMAN_LIBS="-L${xorglibpixman_libdir} -lz -m -lpng -lpixman-1" + export XLIB_CFLAGS="-I${xorglibx11_includedir}" + export XLIB_LIBS="-L${xorglibx11_libdir} -lX11" + export XSERVERCFLAGS_CFLAGS="${CFLAGS}" + export XSERVERCFLAGS_LIBS="${LDFLAGS}" + export XSERVERLIBS_CFLAGS="${CFLAGS}" + export XSERVERLIBS_LIBS="${LDFLAGS}" + # TODO: delete $ROOT/lib $ROOT/include for packaging only. + # TODO: make able to run server rootless or setuid binary? + export CC="$CC -static" + # + ./configure \ + --prefix="$prefix" \ + --mandir="$ROOT/$prefix/share/man" \ + --localstatedir=/var \ + --with-fontrootdir="$prefix/share/fonts/X11" \ + --with-xkb-output="/var/lib/xkb" \ + --disable-dri \ + --disable-dri2 \ + --disable-aiglx \ + --disable-glx-tls \ + --disable-glx \ + --disable-config-dbus \ + --disable-config-hal \ + --disable-shared \ + --enable-static \ + --enable-xfbdev \ + --enable-kdrive \ + --enable-kdrive-kbd \ + --enable-kdrive-mouse \ + --enable-kdrive-evdev=no \ + --with-sha1=libcrypto + # NOTE: "-all-static" is needed. + make -j$nprocs LDFLAGS="-all-static $LDFLAGS" + +install:QV: + # NOTE: "-all-static" is needed. + make -j$nprocs install DESTDIR="$ROOT" LDFLAGS="-all-static $LDFLAGS" + install -m 755 -d "$ROOT/etc/X11/xorg.conf.d" diff --git a/xorgvideoproto/depsinc.mk b/xorgvideoproto/depsinc.mk @@ -0,0 +1,7 @@ +<$xorgvideoproto_DEPDIR/v.mk + +xorgvideoproto_libdir = ${xorgvideoproto_DEPDIR}/videoproto-$v/lib/lib +xorgvideoproto_includedir = ${xorgvideoproto_DEPDIR}/videoproto-$v/lib/include + +DEPS_CFLAGS = $DEPS_CFLAGS -I${xorgvideoproto_includedir} +DEPS_LDFLAGS = $DEPS_LDFLAGS diff --git a/xorgvideoproto/mkfile b/xorgvideoproto/mkfile @@ -0,0 +1,6 @@ +<$mkbuild/mk.3rdparty + +<v.mk +src = videoproto-$v +url = http://xorg.freedesktop.org/releases/individual/proto/videoproto-$v.tar.bz2 +mkfile = ../xorgvideoproto.mk diff --git a/xorgvideoproto/v.mk b/xorgvideoproto/v.mk @@ -0,0 +1 @@ +v = 2.3.2 diff --git a/xorgvideoproto/xorgvideoproto.mk b/xorgvideoproto/xorgvideoproto.mk @@ -0,0 +1,10 @@ +TARG = xorgvideoproto + +<$mkbuild/mk.common-noinst + +xorgvideoproto:QV: + ./configure \ + --prefix="$prefix" \ + --mandir="$ROOT/share/man" + make -j$nprocs + make install DESTDIR="`pwd`/lib" diff --git a/xorgxcbproto/xorgxcbproto.mk b/xorgxcbproto/xorgxcbproto.mk @@ -1,14 +1,11 @@ -# make deps: python2.7 +# make deps: python2.7, xmllint (libxml2). TARG = xorgxcbproto <$mkbuild/mk.common-noinst xorgxcbproto:QV: - export PYTHON="/bin/python2.7" - ./configure --prefix="$prefix" \ - --mandir="$ROOT/share/man" - make -j$nprocs - make install DESTDIR="`pwd`/lib/" - -install:QV: - false + export PYTHON="python2.7" + ./configure \ + --prefix="$prefix" \ + --mandir="$ROOT/share/man" + make -j$nprocs install DESTDIR="`pwd`/lib/" diff --git a/xorgxcmiscproto/depsinc.mk b/xorgxcmiscproto/depsinc.mk @@ -0,0 +1,7 @@ +<$xorgxcmiscproto_DEPDIR/v.mk + +xorgxcmiscproto_libdir = ${xorgxcmiscproto_DEPDIR}/xcmiscproto-$v/lib/lib +xorgxcmiscproto_includedir = ${xorgxcmiscproto_DEPDIR}/xcmiscproto-$v/lib/include + +DEPS_CFLAGS = $DEPS_CFLAGS -I${xorgxcmiscproto_includedir} +DEPS_LDFLAGS = $DEPS_LDFLAGS diff --git a/xorgxcmiscproto/mkfile b/xorgxcmiscproto/mkfile @@ -0,0 +1,6 @@ +<$mkbuild/mk.3rdparty + +<v.mk +src = xcmiscproto-$v +url = http://xorg.freedesktop.org/releases/individual/proto/xcmiscproto-$v.tar.bz2 +mkfile = ../xorgxcmiscproto.mk diff --git a/xorgxcmiscproto/v.mk b/xorgxcmiscproto/v.mk @@ -0,0 +1 @@ +v = 1.2.2 diff --git a/xorgxcmiscproto/xorgxcmiscproto.mk b/xorgxcmiscproto/xorgxcmiscproto.mk @@ -0,0 +1,10 @@ +TARG = xorgxcmiscproto + +<$mkbuild/mk.common-noinst + +xorgxcmiscproto:QV: + ./configure \ + --prefix="$prefix" \ + --mandir="$ROOT/share/man" + make -j$nprocs + make install DESTDIR="`pwd`/lib" diff --git a/xorgxf86bigfontproto/depsinc.mk b/xorgxf86bigfontproto/depsinc.mk @@ -0,0 +1,6 @@ +<$xorgxf86bigfontproto_DEPDIR/v.mk + +xorgxf86bigfontproto_libdir = ${xorgxf86bigfontproto_DEPDIR}/xf86bigfontproto-$v/lib +xorgxf86bigfontproto_includedir = ${xorgxf86bigfontproto_DEPDIR}/xf86bigfontproto-$v/lib/include +DEPS_CFLAGS = $DEPS_CFLAGS -I${xorgxf86bigfontproto_includedir} +DEPS_LDFLAGS = $DEPS_LDFLAGS diff --git a/xorgxf86bigfontproto/mkfile b/xorgxf86bigfontproto/mkfile @@ -0,0 +1,6 @@ +<$mkbuild/mk.3rdparty + +<v.mk +src = xf86bigfontproto-$v +url = http://xorg.freedesktop.org/releases/individual/proto/xf86bigfontproto-$v.tar.bz2 +mkfile = ../xorgxf86bigfontproto.mk diff --git a/xorgxf86bigfontproto/v.mk b/xorgxf86bigfontproto/v.mk @@ -0,0 +1 @@ +v = 1.2.0 diff --git a/xorgxf86bigfontproto/xorgxf86bigfontproto.mk b/xorgxf86bigfontproto/xorgxf86bigfontproto.mk @@ -0,0 +1,8 @@ +TARG = xorgxf86bigfontproto + +<$mkbuild/mk.common-noinst + +xorgxf86bigfontproto:QV: + ./configure --prefix="$prefix" \ + --mandir="$ROOT/share/man" + make -j$nprocs install DESTDIR="`pwd`/lib" diff --git a/xorgxproto/xorgxproto.mk b/xorgxproto/xorgxproto.mk @@ -3,10 +3,8 @@ TARG = xorgxproto <$mkbuild/mk.common-noinst xorgxproto:QV: - ./configure --prefix="$prefix" \ - --mandir="$ROOT/share/man" + ./configure \ + --prefix="$prefix" \ + --mandir="$ROOT/share/man" make -j$nprocs make install DESTDIR="`pwd`/lib" - -install:QV: - false diff --git a/xorgxtrans/xorgxtrans.mk b/xorgxtrans/xorgxtrans.mk @@ -3,10 +3,8 @@ TARG = xorgxtrans <$mkbuild/mk.common-noinst xorgxtrans:QV: - ./configure --prefix="$prefix" \ - --mandir="$ROOT/share/man" + ./configure \ + --prefix="$prefix" \ + --mandir="$ROOT/share/man" make -j$nprocs make install DESTDIR="`pwd`/lib" - -install:QV: - false