[packages/skia] updated BR, less external deps in tarball

glen glen at pld-linux.org
Sun Mar 3 19:13:45 CET 2013


commit 4c08dedfa6e88d0dbc81f275b4e7df0dd640a496
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Sat Mar 2 01:34:09 2013 +0200

    updated BR, less external deps in tarball

 gclient.conf  | 14 +++++++-------
 get-source.sh |  2 +-
 skia.spec     | 12 ++++++------
 3 files changed, 14 insertions(+), 14 deletions(-)
---
diff --git a/skia.spec b/skia.spec
index eff6595..2525bc6 100644
--- a/skia.spec
+++ b/skia.spec
@@ -12,12 +12,16 @@ Release:	0.%{rel}.%{subver}
 License:	BSD
 Group:		Development/Libraries
 Source0:	%{name}-%{subver}.tar.xz
-# Source0-md5:	d3338ba25a4130d8a5e0678cb416cf02
+# Source0-md5:	e2de2d4871a315cd1e252f77cd96dca2
 Source1:	get-source.sh
 Source2:	gclient.conf
 URL:		https://sites.google.com/site/skiadocs/
-#BuildRequires:	cityhash-devel
+BuildRequires:	Mesa-libGL-devel
+BuildRequires:	Mesa-libGLU-devel
+BuildRequires:	cityhash-devel >= 1.1.0
+BuildRequires:	freetype-devel
 BuildRequires:	libstdc++-devel
+BuildRequires:	python-modules
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -51,10 +55,7 @@ Statyczna biblioteka skia.
 %prep
 %setup -qn %{name}-%{subver}
 
-mv skia/{README,LICENSE} .
-
 %build
-cd skia
 %{__python} gyp_skia \
 	--format=make \
 	--depth=. \
@@ -77,7 +78,6 @@ cd skia
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_libdir},%{_includedir}/%{name}}
 
-cd skia
 cp -a include/* $RPM_BUILD_ROOT%{_includedir}/%{name}
 
 cd out/%{!?debug:Release}%{?debug:Debug}
diff --git a/gclient.conf b/gclient.conf
index 4e815fb..2e10516 100644
--- a/gclient.conf
+++ b/gclient.conf
@@ -5,13 +5,13 @@ solutions = [{
 	"managed"     : True,
 	"custom_deps" : {
 		# Windows only
-		'skia/third_party/externals/angle': None,
-		'skia/third_party/externals/cityhash': None
-#		'skia/third_party/externals/freetype': 'https://android.googlesource.com/platform/external/freetype.git',
-#		'skia/third_party/externals/gyp': 'http://gyp.googlecode.com/svn/trunk@1563',
-#		'skia/third_party/externals/jsoncpp': 'http://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk/jsoncpp@248',
-#		'skia/third_party/externals/jsoncpp-chromium': 'http://src.chromium.org/svn/trunk/src/third_party/jsoncpp@125399',
-#		'skia/third_party/externals/libjpeg': 'http://src.chromium.org/svn/trunk/src/third_party/libjpeg@125399',
+#		'skia/third_party/externals/angle': None,
+		'skia/third_party/externals/cityhash': None,
+		'skia/third_party/externals/freetype': None,
+#		'skia/third_party/externals/gyp': None,
+		'skia/third_party/externals/jsoncpp': None,
+		'skia/third_party/externals/jsoncpp-chromium': None,
+		'skia/third_party/externals/libjpeg': None,
 	},
 	"safesync_url": "",
 }]
diff --git a/get-source.sh b/get-source.sh
index 0c7a527..ee675f4 100755
--- a/get-source.sh
+++ b/get-source.sh
@@ -40,7 +40,7 @@ sed -i -re '/"url"/ s,"http[^"]+","'$svnurl'",' .gclient
 
 cd ..
 
-cp -al $package $release_dir
+cp -al $package/$package $release_dir
 XZ_OPT=-e9 tar -caf $tarball --exclude-vcs $release_dir
 rm -rf $release_dir
 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/skia.git/commitdiff/4c08dedfa6e88d0dbc81f275b4e7df0dd640a496



More information about the pld-cvs-commit mailing list