summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--package/firefox/Makefile2
-rw-r--r--package/fltk/Makefile2
-rw-r--r--package/mesa-demos/Makefile2
-rw-r--r--package/mesalib/Makefile (renamed from package/MesaLib/Makefile)13
-rw-r--r--package/mesalib/patches/patch-configure_ac (renamed from package/MesaLib/patches/patch-configure_ac)0
-rw-r--r--package/mesalib/patches/patch-include_c11_threads_posix_h (renamed from package/MesaLib/patches/patch-include_c11_threads_posix_h)0
-rw-r--r--package/mesalib/patches/patch-src_gallium_include_pipe_p_config_h (renamed from package/MesaLib/patches/patch-src_gallium_include_pipe_p_config_h)0
-rw-r--r--package/mesalib/patches/patch-src_mesa_main_querymatrix_c (renamed from package/MesaLib/patches/patch-src_mesa_main_querymatrix_c)0
-rw-r--r--package/xbmc/Makefile2
-rw-r--r--package/xf86-video-ati/Makefile2
-rw-r--r--package/xf86-video-intel/Makefile2
-rw-r--r--package/xorg-server/Makefile4
12 files changed, 14 insertions, 15 deletions
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
index e34ef6645..e9e5f07e3 100644
--- a/package/MesaLib/Makefile
+++ b/package/mesalib/Makefile
@@ -3,11 +3,10 @@
include $(TOPDIR)/rules.mk
-PKG_NAME:= MesaLib
-PKG_VERSION:= 10.1.0
-PKG_SUBVER:= 10.1
-PKG_RELEASE:= 3
-PKG_MD5SUM:= 08e796ec7122aa299d32d4f67a254315
+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
@@ -17,13 +16,13 @@ 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_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:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
+DISTFILES:= MesaLib-${PKG_VERSION}.tar.gz
WRKDIST= ${WRKDIR}/Mesa-${PKG_VERSION}
include $(TOPDIR)/mk/package.mk
diff --git a/package/MesaLib/patches/patch-configure_ac b/package/mesalib/patches/patch-configure_ac
index 32b3d8053..32b3d8053 100644
--- a/package/MesaLib/patches/patch-configure_ac
+++ b/package/mesalib/patches/patch-configure_ac
diff --git a/package/MesaLib/patches/patch-include_c11_threads_posix_h b/package/mesalib/patches/patch-include_c11_threads_posix_h
index 2e79238f7..2e79238f7 100644
--- a/package/MesaLib/patches/patch-include_c11_threads_posix_h
+++ b/package/mesalib/patches/patch-include_c11_threads_posix_h
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
index b929e8758..b929e8758 100644
--- a/package/MesaLib/patches/patch-src_gallium_include_pipe_p_config_h
+++ b/package/mesalib/patches/patch-src_gallium_include_pipe_p_config_h
diff --git a/package/MesaLib/patches/patch-src_mesa_main_querymatrix_c b/package/mesalib/patches/patch-src_mesa_main_querymatrix_c
index db87901d3..db87901d3 100644
--- a/package/MesaLib/patches/patch-src_mesa_main_querymatrix_c
+++ b/package/mesalib/patches/patch-src_mesa_main_querymatrix_c
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