From 5183e86e93dd3245be7e1e5718b68a5ce1b1e1ec Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 12 Jun 2014 09:45:24 +0200 Subject: update to latest upstream version, rename to lowercase --- package/MesaLib/Makefile | 73 ---------------------- package/MesaLib/patches/patch-configure_ac | 11 ---- .../patches/patch-include_c11_threads_posix_h | 11 ---- .../patch-src_gallium_include_pipe_p_config_h | 11 ---- .../patches/patch-src_mesa_main_querymatrix_c | 11 ---- package/firefox/Makefile | 2 +- package/fltk/Makefile | 2 +- package/mesa-demos/Makefile | 2 +- package/mesalib/Makefile | 72 +++++++++++++++++++++ package/mesalib/patches/patch-configure_ac | 11 ++++ .../patches/patch-include_c11_threads_posix_h | 11 ++++ .../patch-src_gallium_include_pipe_p_config_h | 11 ++++ .../patches/patch-src_mesa_main_querymatrix_c | 11 ++++ package/xbmc/Makefile | 2 +- package/xf86-video-ati/Makefile | 2 +- package/xf86-video-intel/Makefile | 2 +- package/xorg-server/Makefile | 4 +- 17 files changed, 124 insertions(+), 125 deletions(-) delete mode 100644 package/MesaLib/Makefile delete mode 100644 package/MesaLib/patches/patch-configure_ac delete mode 100644 package/MesaLib/patches/patch-include_c11_threads_posix_h delete mode 100644 package/MesaLib/patches/patch-src_gallium_include_pipe_p_config_h delete mode 100644 package/MesaLib/patches/patch-src_mesa_main_querymatrix_c create mode 100644 package/mesalib/Makefile create mode 100644 package/mesalib/patches/patch-configure_ac create mode 100644 package/mesalib/patches/patch-include_c11_threads_posix_h create mode 100644 package/mesalib/patches/patch-src_gallium_include_pipe_p_config_h create mode 100644 package/mesalib/patches/patch-src_mesa_main_querymatrix_c diff --git a/package/MesaLib/Makefile b/package/MesaLib/Makefile deleted file mode 100644 index e34ef6645..000000000 --- a/package/MesaLib/Makefile +++ /dev/null @@ -1,73 +0,0 @@ -# This file is part of the OpenADK project. OpenADK is copyrighted -# material, please see the LICENCE file in the top-level directory. - -include $(TOPDIR)/rules.mk - -PKG_NAME:= MesaLib -PKG_VERSION:= 10.1.0 -PKG_SUBVER:= 10.1 -PKG_RELEASE:= 3 -PKG_MD5SUM:= 08e796ec7122aa299d32d4f67a254315 -PKG_DESCR:= 3d graphics library -PKG_SECTION:= libs/video -PKG_DEPENDS:= libxdamage libxfixes libdrm libxxf86vm libexpat -PKG_DEPENDS+= libxml2 libxml2-python libstdcxx -PKG_BUILDDEP:= autotool python2 libxml2 libXdamage libXfixes -PKG_BUILDDEP+= libXxf86vm libdrm dri2proto glproto expat libXext -PKG_BUILDDEP+= eudev dri3proto presentproto xcb-proto libxcb -PKG_BUILDDEP+= libxshmfence -PKG_URL:= http://www.mesa3d.org/ -PKG_SITES:= ftp://ftp.freedesktop.org/pub/mesa/${PKG_SUBVER}/ -PKG_LIBNAME:= mesalib -PKG_OPTS:= dev - -PKG_ARCH_DEPENDS:= x86 x86_64 mips mipsel mips64 mips64el arm - -DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz -WRKDIST= ${WRKDIR}/Mesa-${PKG_VERSION} - -include $(TOPDIR)/mk/package.mk - -$(eval $(call PKG_template,MESALIB,mesalib,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) - -include $(TOPDIR)/mk/python.mk - -ifeq ($(ADK_HOST_DARWIN),y) -PYTHON:=/opt/local/bin/python2.7 -endif -ifeq ($(ADK_HOST_OPENBSD),y) -PYTHON:=/usr/local/bin/python2.7 -endif -ifeq ($(ADK_HOST_CYGWIN),y) -PYTHON:=/usr/bin/python2.7 -endif - -ifeq (${ADK_TARGET_SYSTEM_IBM_X40},y) -DRI_DRIVERS:=i915 -endif - -AUTOTOOL_STYLE:= autoreconf -CONFIGURE_ARGS+= --disable-static \ - --disable-gallium-llvm \ - --with-gallium-drivers=swrast \ - --disable-gles1 \ - --disable-gles2 \ - --with-dri-drivers=${DRI_DRIVERS},swrast -CONFIGURE_ENV+= MISSING="echo" \ - PYTHON2=$(PYTHON) -XAKE_FLAGS+= HOST_CC=${CC_FOR_BUILD} - -mesalib-install: - $(INSTALL_DIR) $(IDIR_MESALIB)/usr/lib/dri - $(CP) $(WRKINST)/usr/lib/libGL*.so* \ - $(IDIR_MESALIB)/usr/lib - $(CP) $(WRKINST)/usr/lib/libglapi.so* \ - $(IDIR_MESALIB)/usr/lib - ${CP} $(WRKINST)/usr/lib/dri/swrast_dri.so \ - ${IDIR_MESALIB}/usr/lib/dri/ -ifeq (${ADK_TARGET_SYSTEM_IBM_X40},y) - ${CP} $(WRKINST)/usr/lib/dri/i915_dri.so \ - ${IDIR_MESALIB}/usr/lib/dri/ -endif - -include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/MesaLib/patches/patch-configure_ac b/package/MesaLib/patches/patch-configure_ac deleted file mode 100644 index 32b3d8053..000000000 --- a/package/MesaLib/patches/patch-configure_ac +++ /dev/null @@ -1,11 +0,0 @@ ---- Mesa-10.1.0.orig/configure.ac 2014-02-27 02:56:39.000000000 +0100 -+++ Mesa-10.1.0/configure.ac 2014-03-14 21:36:14.000000000 +0100 -@@ -65,7 +65,7 @@ AC_PATH_PROG([PERL], [perl]) - - AC_CHECK_PROG(INDENT, indent, indent, cat) - if test "x$INDENT" != "xcat"; then -- AC_SUBST(INDENT_FLAGS, '-i4 -nut -br -brs -npcs -ce -TGLubyte -TGLbyte -TBool') -+ AC_SUBST(INDENT_FLAGS, '-i4 -br -brs -npcs -ce -TGLubyte -TGLbyte -TBool') - fi - - AC_PROG_INSTALL diff --git a/package/MesaLib/patches/patch-include_c11_threads_posix_h b/package/MesaLib/patches/patch-include_c11_threads_posix_h deleted file mode 100644 index 2e79238f7..000000000 --- a/package/MesaLib/patches/patch-include_c11_threads_posix_h +++ /dev/null @@ -1,11 +0,0 @@ ---- Mesa-10.1.0.orig/include/c11/threads_posix.h 2014-02-27 02:56:39.000000000 +0100 -+++ Mesa-10.1.0/include/c11/threads_posix.h 2014-03-14 21:54:55.000000000 +0100 -@@ -176,7 +176,7 @@ mtx_init(mtx_t *mtx, int type) - return thrd_error; - pthread_mutexattr_init(&attr); - if ((type & mtx_recursive) != 0) { --#if defined(__linux__) || defined(__linux) -+#if defined(__GLIBC__) - pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE_NP); - #else - pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE); diff --git a/package/MesaLib/patches/patch-src_gallium_include_pipe_p_config_h b/package/MesaLib/patches/patch-src_gallium_include_pipe_p_config_h deleted file mode 100644 index b929e8758..000000000 --- a/package/MesaLib/patches/patch-src_gallium_include_pipe_p_config_h +++ /dev/null @@ -1,11 +0,0 @@ ---- Mesa-10.1.0.orig/src/gallium/include/pipe/p_config.h 2014-02-27 02:56:39.000000000 +0100 -+++ Mesa-10.1.0/src/gallium/include/pipe/p_config.h 2014-03-14 21:36:14.000000000 +0100 -@@ -130,7 +130,7 @@ - * Endian detection. - */ - --#ifdef __GLIBC__ -+#ifdef __linux__ - #include - - #if __BYTE_ORDER == __LITTLE_ENDIAN diff --git a/package/MesaLib/patches/patch-src_mesa_main_querymatrix_c b/package/MesaLib/patches/patch-src_mesa_main_querymatrix_c deleted file mode 100644 index db87901d3..000000000 --- a/package/MesaLib/patches/patch-src_mesa_main_querymatrix_c +++ /dev/null @@ -1,11 +0,0 @@ ---- Mesa-10.1.0.orig/src/mesa/main/querymatrix.c 2014-02-27 02:56:40.000000000 +0100 -+++ Mesa-10.1.0/src/mesa/main/querymatrix.c 2014-03-14 21:36:14.000000000 +0100 -@@ -76,7 +76,7 @@ fpclassify(double x) - #elif defined(__APPLE__) || defined(__CYGWIN__) || defined(__FreeBSD__) || \ - defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__) || \ - (defined(__sun) && defined(__C99FEATURES__)) || defined(__MINGW32__) || \ -- (defined(__sun) && defined(__GNUC__)) || defined(ANDROID) || defined(__HAIKU__) -+ (defined(__sun) && defined(__GNUC__)) || defined(ANDROID) || defined(__HAIKU__) || 1 - - /* fpclassify is available. */ - diff --git a/package/firefox/Makefile b/package/firefox/Makefile index a84e0b080..d4d46ed46 100644 --- a/package/firefox/Makefile +++ b/package/firefox/Makefile @@ -13,7 +13,7 @@ PKG_DEPENDS:= libpthread alsa-lib glib libgtk libpng libtiff libxcursor libffi PKG_DEPENDS+= nspr nss libjpeg-turbo libatk pango cairo libxt libx11 libstdcxx hicolor-icon-theme PKG_DEPENDS+= libxdamage libxfixes libidl libsqlite libxcomposite gdk-pixbuf librt PKG_DEPENDS+= harfbuzz mesalib libvpx libbz2 ca-certificates libevent -PKG_BUILDDEP:= alsa-lib glib gtk+ libIDL libX11 MesaLib libtiff gdk-pixbuf +PKG_BUILDDEP:= alsa-lib glib gtk+ libIDL libX11 mesalib libtiff gdk-pixbuf PKG_BUILDDEP+= nspr nss libjpeg-turbo libXt fontconfig sqlite atk libpng hicolor-icon-theme PKG_BUILDDEP+= libvpx pango gettext-tiny bzip2 libevent bzip2-host python2-host yasm-host PKG_BUILDDEP+= zip-host diff --git a/package/fltk/Makefile b/package/fltk/Makefile index 7bae90522..36866aa86 100644 --- a/package/fltk/Makefile +++ b/package/fltk/Makefile @@ -10,7 +10,7 @@ PKG_MD5SUM:= 9f7e707d4fb7a5a76f0f9b73ff70623d PKG_DESCR:= fast light toolkit PKG_SECTION:= libs/misc PKG_DEPENDS:= mesalib libx11 libxi freeglut libfreetype -PKG_BUILDDEP:= libX11 libXi MesaLib freeglut freetype +PKG_BUILDDEP:= libX11 libXi mesalib freeglut freetype PKG_URL:= http://www.fltk.org/ PKG_SITES:= http://openadk.org/distfiles/ PKG_LIBNAME:= libfltk diff --git a/package/mesa-demos/Makefile b/package/mesa-demos/Makefile index 6ae6409da..0a6ebd8cc 100644 --- a/package/mesa-demos/Makefile +++ b/package/mesa-demos/Makefile @@ -10,7 +10,7 @@ PKG_MD5SUM:= 4049d98dd4131212e2842b770f1b0fa5 PKG_DESCR:= opengl demo apps PKG_SECTION:= mm/video PKG_DEPENDS:= mesalib -PKG_BUILDDEP:= MesaLib libglew glu +PKG_BUILDDEP:= mesalib libglew glu PKG_SITES:= ftp://ftp.freedesktop.org/pub/mesa/demos/${PKG_VERSION}/ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz diff --git a/package/mesalib/Makefile b/package/mesalib/Makefile new file mode 100644 index 000000000..e9e5f07e3 --- /dev/null +++ b/package/mesalib/Makefile @@ -0,0 +1,72 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include $(TOPDIR)/rules.mk + +PKG_NAME:= mesalib +PKG_VERSION:= 10.2.1 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 96f892dae2d0bb14ac9c2113f586c909 +PKG_DESCR:= 3d graphics library +PKG_SECTION:= libs/video +PKG_DEPENDS:= libxdamage libxfixes libdrm libxxf86vm libexpat +PKG_DEPENDS+= libxml2 libxml2-python libstdcxx +PKG_BUILDDEP:= autotool python2 libxml2 libXdamage libXfixes +PKG_BUILDDEP+= libXxf86vm libdrm dri2proto glproto expat libXext +PKG_BUILDDEP+= eudev dri3proto presentproto xcb-proto libxcb +PKG_BUILDDEP+= libxshmfence +PKG_URL:= http://www.mesa3d.org/ +PKG_SITES:= ftp://ftp.freedesktop.org/pub/mesa/${PKG_VERSION}/ +PKG_LIBNAME:= mesalib +PKG_OPTS:= dev + +PKG_ARCH_DEPENDS:= x86 x86_64 mips mipsel mips64 mips64el arm + +DISTFILES:= MesaLib-${PKG_VERSION}.tar.gz +WRKDIST= ${WRKDIR}/Mesa-${PKG_VERSION} + +include $(TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,MESALIB,mesalib,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) + +include $(TOPDIR)/mk/python.mk + +ifeq ($(ADK_HOST_DARWIN),y) +PYTHON:=/opt/local/bin/python2.7 +endif +ifeq ($(ADK_HOST_OPENBSD),y) +PYTHON:=/usr/local/bin/python2.7 +endif +ifeq ($(ADK_HOST_CYGWIN),y) +PYTHON:=/usr/bin/python2.7 +endif + +ifeq (${ADK_TARGET_SYSTEM_IBM_X40},y) +DRI_DRIVERS:=i915 +endif + +AUTOTOOL_STYLE:= autoreconf +CONFIGURE_ARGS+= --disable-static \ + --disable-gallium-llvm \ + --with-gallium-drivers=swrast \ + --disable-gles1 \ + --disable-gles2 \ + --with-dri-drivers=${DRI_DRIVERS},swrast +CONFIGURE_ENV+= MISSING="echo" \ + PYTHON2=$(PYTHON) +XAKE_FLAGS+= HOST_CC=${CC_FOR_BUILD} + +mesalib-install: + $(INSTALL_DIR) $(IDIR_MESALIB)/usr/lib/dri + $(CP) $(WRKINST)/usr/lib/libGL*.so* \ + $(IDIR_MESALIB)/usr/lib + $(CP) $(WRKINST)/usr/lib/libglapi.so* \ + $(IDIR_MESALIB)/usr/lib + ${CP} $(WRKINST)/usr/lib/dri/swrast_dri.so \ + ${IDIR_MESALIB}/usr/lib/dri/ +ifeq (${ADK_TARGET_SYSTEM_IBM_X40},y) + ${CP} $(WRKINST)/usr/lib/dri/i915_dri.so \ + ${IDIR_MESALIB}/usr/lib/dri/ +endif + +include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/mesalib/patches/patch-configure_ac b/package/mesalib/patches/patch-configure_ac new file mode 100644 index 000000000..32b3d8053 --- /dev/null +++ b/package/mesalib/patches/patch-configure_ac @@ -0,0 +1,11 @@ +--- Mesa-10.1.0.orig/configure.ac 2014-02-27 02:56:39.000000000 +0100 ++++ Mesa-10.1.0/configure.ac 2014-03-14 21:36:14.000000000 +0100 +@@ -65,7 +65,7 @@ AC_PATH_PROG([PERL], [perl]) + + AC_CHECK_PROG(INDENT, indent, indent, cat) + if test "x$INDENT" != "xcat"; then +- AC_SUBST(INDENT_FLAGS, '-i4 -nut -br -brs -npcs -ce -TGLubyte -TGLbyte -TBool') ++ AC_SUBST(INDENT_FLAGS, '-i4 -br -brs -npcs -ce -TGLubyte -TGLbyte -TBool') + fi + + AC_PROG_INSTALL diff --git a/package/mesalib/patches/patch-include_c11_threads_posix_h b/package/mesalib/patches/patch-include_c11_threads_posix_h new file mode 100644 index 000000000..2e79238f7 --- /dev/null +++ b/package/mesalib/patches/patch-include_c11_threads_posix_h @@ -0,0 +1,11 @@ +--- Mesa-10.1.0.orig/include/c11/threads_posix.h 2014-02-27 02:56:39.000000000 +0100 ++++ Mesa-10.1.0/include/c11/threads_posix.h 2014-03-14 21:54:55.000000000 +0100 +@@ -176,7 +176,7 @@ mtx_init(mtx_t *mtx, int type) + return thrd_error; + pthread_mutexattr_init(&attr); + if ((type & mtx_recursive) != 0) { +-#if defined(__linux__) || defined(__linux) ++#if defined(__GLIBC__) + pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE_NP); + #else + pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE); diff --git a/package/mesalib/patches/patch-src_gallium_include_pipe_p_config_h b/package/mesalib/patches/patch-src_gallium_include_pipe_p_config_h new file mode 100644 index 000000000..b929e8758 --- /dev/null +++ b/package/mesalib/patches/patch-src_gallium_include_pipe_p_config_h @@ -0,0 +1,11 @@ +--- Mesa-10.1.0.orig/src/gallium/include/pipe/p_config.h 2014-02-27 02:56:39.000000000 +0100 ++++ Mesa-10.1.0/src/gallium/include/pipe/p_config.h 2014-03-14 21:36:14.000000000 +0100 +@@ -130,7 +130,7 @@ + * Endian detection. + */ + +-#ifdef __GLIBC__ ++#ifdef __linux__ + #include + + #if __BYTE_ORDER == __LITTLE_ENDIAN diff --git a/package/mesalib/patches/patch-src_mesa_main_querymatrix_c b/package/mesalib/patches/patch-src_mesa_main_querymatrix_c new file mode 100644 index 000000000..db87901d3 --- /dev/null +++ b/package/mesalib/patches/patch-src_mesa_main_querymatrix_c @@ -0,0 +1,11 @@ +--- Mesa-10.1.0.orig/src/mesa/main/querymatrix.c 2014-02-27 02:56:40.000000000 +0100 ++++ Mesa-10.1.0/src/mesa/main/querymatrix.c 2014-03-14 21:36:14.000000000 +0100 +@@ -76,7 +76,7 @@ fpclassify(double x) + #elif defined(__APPLE__) || defined(__CYGWIN__) || defined(__FreeBSD__) || \ + defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__) || \ + (defined(__sun) && defined(__C99FEATURES__)) || defined(__MINGW32__) || \ +- (defined(__sun) && defined(__GNUC__)) || defined(ANDROID) || defined(__HAIKU__) ++ (defined(__sun) && defined(__GNUC__)) || defined(ANDROID) || defined(__HAIKU__) || 1 + + /* fpclassify is available. */ + diff --git a/package/xbmc/Makefile b/package/xbmc/Makefile index 135f38744..d396f0534 100644 --- a/package/xbmc/Makefile +++ b/package/xbmc/Makefile @@ -19,7 +19,7 @@ PKG_DEPENDS+= taglib libjasper libmp3lame libmicrohttpd PKG_DEPENDS+= libbluray libgpg-error libudev python2-mod-sqlite PKG_DEPENDS+= libssh libcec libnfs librtmp samba-lib libncurses PKG_DEPENDS+= libxslt libvorbisenc alsa-lib glib libglu librt -PKG_BUILDDEP:= autotool boost ffmpeg python2 MesaLib libglew libass +PKG_BUILDDEP:= autotool boost ffmpeg python2 mesalib libglew libass PKG_BUILDDEP+= libmpeg2 libmad libjpeg-turbo libogg libvorbis libmodplug PKG_BUILDDEP+= curl flac openssl bzip2 libtiff liblzo yajl PKG_BUILDDEP+= tinyxml sqlite pcre libpng libcdio freetype diff --git a/package/xf86-video-ati/Makefile b/package/xf86-video-ati/Makefile index e1cf24505..bc8c485ee 100644 --- a/package/xf86-video-ati/Makefile +++ b/package/xf86-video-ati/Makefile @@ -10,7 +10,7 @@ PKG_MD5SUM:= 6bb71cff9ad9c5c7b258b2b6c56fdc95 PKG_DESCR:= x11 driver for ati vga chip PKG_SECTION:= x11/drivers PKG_DEPENDS:= xorg-server libdrm mesalib libudev libstdcxx -PKG_BUILDDEP:= xorg-server libdrm xf86driproto MesaLib eudev +PKG_BUILDDEP:= xorg-server libdrm xf86driproto mesalib eudev PKG_SITES:= ${MASTER_SITE_XORG} PKG_ARCH_DEPENDS:= !arm !m68k diff --git a/package/xf86-video-intel/Makefile b/package/xf86-video-intel/Makefile index fbddaca69..d2fbf61b2 100644 --- a/package/xf86-video-intel/Makefile +++ b/package/xf86-video-intel/Makefile @@ -10,7 +10,7 @@ PKG_MD5SUM:= de51db2408a222ef1c52725f5aa2f185 PKG_DESCR:= x11 driver for intel vga chips PKG_SECTION:= x11/drivers PKG_DEPENDS:= xorg-server libdrm mesalib libstdcxx -PKG_BUILDDEP:= xorg-server libdrm xf86driproto MesaLib +PKG_BUILDDEP:= xorg-server libdrm xf86driproto mesalib PKG_SITES:= ${MASTER_SITE_XORG} PKG_SYSTEM_DEPENDS:= ibm-x40 diff --git a/package/xorg-server/Makefile b/package/xorg-server/Makefile index cd302c37b..68014fa22 100644 --- a/package/xorg-server/Makefile +++ b/package/xorg-server/Makefile @@ -18,7 +18,7 @@ PKG_BUILDDEP:= libX11 randrproto renderproto fixesproto damageproto PKG_BUILDDEP+= scrnsaverproto resourceproto fontsproto videoproto PKG_BUILDDEP+= compositeproto evieext libxkbfile libXfont pixman PKG_BUILDDEP+= libpciaccess openssl xf86dgaproto recordproto -PKG_BUILDDEP+= xineramaproto +PKG_BUILDDEP+= xineramaproto presentproto PKG_URL:= http://www.x.org/ PKG_SITES:= ${MASTER_SITE_XORG} PKG_OPTS:= dev @@ -31,7 +31,7 @@ PKG_ARCH_DEPENDS:= !m68k PKG_FLAVOURS_XORG_SERVER:= WITH_DRI WITH_KDRIVE PKGFS_WITH_DRI:= mesalib PKGFD_WITH_DRI:= enable DRI support -PKGFB_WITH_DRI:= xf86driproto glproto MesaLib +PKGFB_WITH_DRI:= xf86driproto glproto mesalib PKGFD_WITH_KDRIVE:= Build Kdrive Xfbdev server PKG_CHOICES_XORG_SERVER:= WITH_GCRYPT WITH_CRYPTO -- cgit v1.2.3