From f14c1fc5515445840d2fbe3350cff0c03eae0b55 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 29 May 2014 11:40:49 +0200 Subject: resolve merge conflict --- package/MesaLib/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'package/MesaLib') diff --git a/package/MesaLib/Makefile b/package/MesaLib/Makefile index e3db5762f..e34ef6645 100644 --- a/package/MesaLib/Makefile +++ b/package/MesaLib/Makefile @@ -8,8 +8,8 @@ PKG_VERSION:= 10.1.0 PKG_SUBVER:= 10.1 PKG_RELEASE:= 3 PKG_MD5SUM:= 08e796ec7122aa299d32d4f67a254315 -PKG_DESCR:= MESA 3D graphics library -PKG_SECTION:= libs +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 -- cgit v1.2.3