* trunk/nonfree/self-build-xbmc

  - new upstream release


git-svn-id: http://trac.vinelinux.org/repos/projects/specs@7458 ec354946-7b23-47d6-9f5a-488ba84defc7

nonfree/self-build-xbmc/self-build-xbmc-vl.spec

@@ -6,12 +6,12 @@
 Summary:	Package to automatically build %{pkgname} rpm package
 Summary(ja): 	%{pkgname} の rpm パッケージを自動作成するパッケージ
 Name:		%{name}
-Version:	11.0
-Release: 	5%{?_dist_release}
+Version:	12.0
+Release: 	1%{?_dist_release}
 Source0:	%{pkgname}-vl.spec
 Source1:	%{pkgname}.desktop
-Source2:	%{pkgname}-%{version}-strings.xml
-Source3:	%{pkgname}-%{version}-Confluence-strings.xml
+#Source2:	%{pkgname}-%{version}-strings.xml
+#Source3:	%{pkgname}-%{version}-Confluence-strings.xml
 Source4:	%{pkgname}-%{version}-default-locale.patch
 
 License:	GPLv2+
@@ -27,6 +27,7 @@ Requires(post):	hicolor-icon-theme
 Requires(post):	desktop-file-utils
 
 Requires(post):	MySQL-devel
+Requires(post):	SDL_gfx-devel
 Requires(post):	SDL_image-devel
 Requires(post):	SDL_mixer-devel
 Requires(post):	alsa-lib-devel
@@ -38,6 +39,7 @@ Requires(post):	curl-devel
 Requires(post):	cvs
 Requires(post):	dbus-devel
 Requires(post):	desktop-file-utils
+Requires(post):	doxygen
 Requires(post):	enca-devel
 Requires(post):	flac-devel
 Requires(post):	fontconfig-devel
@@ -46,6 +48,7 @@ Requires(post):	glew-devel
 Requires(post):	gperf
 Requires(post):	hal-devel
 Requires(post):	jasper-devel
+Requires(post):	java >= 1.7
 Requires(post):	libXinerama-devel
 Requires(post):	libXmu-devel
 Requires(post):	libXrandr-devel
@@ -62,9 +65,13 @@ Requires(post):	libogg-devel
 Requires(post):	libplist-devel
 Requires(post):	libpng-devel
 Requires(post):	libsamplerate-devel
+Requires(post):	libssh-devel
+Requires(post):	libssh2-devel
 Requires(post):	libsmbclient-devel
 Requires(post):	libtiff-devel
-Requires(post): libudev-devel
+Requires(post):	libtool-ltdl-devel
+Requires(post):	libudev-devel
+Requires(post):	libva-devel
 Requires(post):	libvorbis-devel
 Requires(post):	nasm
 Requires(post):	openssl-devel
@@ -73,6 +80,9 @@ Requires(post):	pcre-devel
 Requires(post):	pulseaudio-libs-devel
 Requires(post):	python-devel
 Requires(post):	sqlite3-devel
+Requires(post):	swig
+Requires(post):	taglib-devel >= 1.8
+Requires(post):	tinyxml-devel
 Requires(post):	unzip
 Requires(post):	wavpack-devel
 Requires(post):	yajl-devel
@@ -155,8 +165,8 @@ XBMC はいくつもの賞を受賞したフリーでオープンソース (GPL)
 %{__install} -d %{buildroot}/%{_datadir}/%{name}
 %{__install} -m 644 %{SOURCE0} %{buildroot}/%{_datadir}/%{name}
 %{__install} -m 644 %{SOURCE1} %{buildroot}/%{_datadir}/%{name}
-%{__install} -m 644 %{SOURCE2} %{buildroot}/%{_datadir}/%{name}
-%{__install} -m 644 %{SOURCE3} %{buildroot}/%{_datadir}/%{name}
+#%{__install} -m 644 %{SOURCE2} %{buildroot}/%{_datadir}/%{name}
+#%{__install} -m 644 %{SOURCE3} %{buildroot}/%{_datadir}/%{name}
 %{__install} -m 644 %{SOURCE4} %{buildroot}/%{_datadir}/%{name}
 
 
@@ -174,6 +184,9 @@ XBMC はいくつもの賞を受賞したフリーでオープンソース (GPL)
 
 
 %changelog
+* Sun Feb 10 2013 MATSUBAYASHI Kohji <shaolin@vinelinux.org> - 12.0-1
+- new upstream release
+
 * Fri Mar 30 2012 MATSUBAYASHI Kohji <shaolin@vinelinux.org> - 11.0-5
 - fix silly typo in Source11
 

nonfree/self-build-xbmc/xbmc-12.0-default-locale.patch

@@ -0,0 +1,34 @@
+diff -uNr xbmc-12.0.orig/xbmc/settings/GUISettings.cpp xbmc-12.0/xbmc/settings/GUISettings.cpp
+--- xbmc-12.0.orig/xbmc/settings/GUISettings.cpp	2013-01-29 23:20:27.000000000 +0900
++++ xbmc-12.0/xbmc/settings/GUISettings.cpp	2013-02-10 09:26:00.805133453 +0900
+@@ -875,7 +875,7 @@
+   AddString(laf, "lookandfeel.skinsettings", 21417, "", BUTTON_CONTROL_STANDARD);
+   AddString(laf, "lookandfeel.skintheme",15111,"SKINDEFAULT", SPIN_CONTROL_TEXT);
+   AddString(laf, "lookandfeel.skincolors",14078, "SKINDEFAULT", SPIN_CONTROL_TEXT);
+-  AddString(laf, "lookandfeel.font",13303,"Default", SPIN_CONTROL_TEXT);
++  AddString(laf, "lookandfeel.font",13303,"Arial", SPIN_CONTROL_TEXT);
+   AddInt(laf, "lookandfeel.skinzoom",20109, 0, -20, 2, 20, SPIN_CONTROL_INT, MASK_PERCENT);
+   AddInt(laf, "lookandfeel.startupwindow",512,1, WINDOW_HOME, 1, WINDOW_PYTHON_END, SPIN_CONTROL_TEXT);
+   AddString(laf, "lookandfeel.soundskin",15108,"SKINDEFAULT", SPIN_CONTROL_TEXT);
+@@ -884,8 +884,8 @@
+   AddString(laf, "lookandfeel.rssedit", 21450, "", BUTTON_CONTROL_STANDARD);
+ 
+   CSettingsCategory* loc = AddCategory(SETTINGS_APPEARANCE, "locale", 14090);
+-  AddString(loc, "locale.language",248,"English", SPIN_CONTROL_TEXT);
+-  AddString(loc, "locale.country", 20026, "USA (12h)", SPIN_CONTROL_TEXT);
++  AddString(loc, "locale.language",248,"Japanese", SPIN_CONTROL_TEXT);
++  AddString(loc, "locale.country", 20026, "Japan", SPIN_CONTROL_TEXT);
+   AddString(loc, "locale.charset", 14091, "DEFAULT", SPIN_CONTROL_TEXT); // charset is set by the language file
+ 
+   bool use_timezone = false;
+@@ -901,8 +901,8 @@
+   if (use_timezone)
+   {
+     AddSeparator(loc, "locale.sep1");
+-    AddString(loc, "locale.timezonecountry", 14079, g_timezone.GetCountryByTimezone(g_timezone.GetOSConfiguredTimezone()), SPIN_CONTROL_TEXT);
+-    AddString(loc, "locale.timezone", 14080, g_timezone.GetOSConfiguredTimezone(), SPIN_CONTROL_TEXT);
++    AddString(loc, "locale.timezonecountry", 14079, "Japan", SPIN_CONTROL_TEXT);
++    AddString(loc, "locale.timezone", 14080, "Asia/Tokyo", SPIN_CONTROL_TEXT);
+   }
+ #endif
+ #ifdef HAS_TIME_SERVER

nonfree/self-build-xbmc/xbmc-vl.spec

@@ -1,18 +1,18 @@
 Summary:	XBMC is a free Media Center
 Summary(ja): 	XBMC メディアセンター
 Name:		xbmc
-Version:	11.0
-Release: 	5%{?_dist_release}
+Version:	12.0
+Release: 	1%{?_dist_release}
 Source0:	%{name}-%{version}.tar.gz
 Source1:	%{name}.desktop
 #i18n
 #Source10:	xbmc-9.11-langinfo.xml
-Source11:	xbmc-11.0-strings.xml
-Source12:	xbmc-11.0-Confluence-strings.xml
+#Source11:	xbmc-11.0-strings.xml
+#Source12:	xbmc-11.0-Confluence-strings.xml
 #lircd patch
 #Patch0:		xbmc-9.11-lircd.patch
 # change default locale and font
-Patch1:		xbmc-11.0-default-locale.patch
+Patch1:		xbmc-%{version}-default-locale.patch
 License:	GPLv2+
 Group:		Applications/Multimedia
 URL:		http://xbmc.org/
@@ -25,6 +25,7 @@ Requires(post):	 desktop-file-utils
 Requires(postun):desktop-file-utils
 
 BuildRequires:	MySQL-devel
+BuildRequires:	SDL_gfx-devel
 BuildRequires:	SDL_image-devel
 BuildRequires:	SDL_mixer-devel
 BuildRequires:	alsa-lib-devel
@@ -35,6 +36,7 @@ BuildRequires:	curl-devel
 BuildRequires:	cvs
 BuildRequires:	dbus-devel
 BuildRequires:	desktop-file-utils
+BuildRequires:	doxygen
 BuildRequires:	enca-devel
 BuildRequires:	flac-devel
 BuildRequires:	fontconfig-devel
@@ -43,6 +45,7 @@ BuildRequires:	glew-devel
 BuildRequires:	gperf
 BuildRequires:	hal-devel
 BuildRequires:	jasper-devel
+BuildRequires:	java >= 1.7
 BuildRequires:	libXinerama-devel
 BuildRequires:	libXmu-devel
 BuildRequires:	libXrandr-devel
@@ -59,9 +62,13 @@ BuildRequires:	libogg-devel
 BuildRequires:	libplist-devel
 BuildRequires:	libpng-devel
 BuildRequires:	libsamplerate-devel
+BuildRequires:	libssh-devel
+BuildRequires:	libssh2-devel
 BuildRequires:	libsmbclient-devel
 BuildRequires:	libtiff-devel
+BuildRequires:	libtool-ltdl-devel
 BuildRequires:	libudev-devel
+BuildRequires:	libva-devel
 BuildRequires:	libvorbis-devel
 BuildRequires:	nasm
 BuildRequires:	openssl-devel
@@ -69,6 +76,9 @@ BuildRequires:	lzo-devel
 BuildRequires:	pcre-devel
 BuildRequires:	pulseaudio-libs-devel
 BuildRequires:	sqlite3-devel
+BuildRequires:	swig
+BuildRequires:	taglib-devel >= 1.8
+BuildRequires:	tinyxml-devel
 BuildRequires:	unzip
 BuildRequires:	wavpack-devel
 BuildRequires:	zlib-devel
@@ -126,9 +136,9 @@ XBMC をインストールすれば、あなたの PC は多機能なマルチ
 
 #setup language files
 #%{__cp} -f %{SOURCE10} language/Japanese/langinfo.xml
-%{__cp} -f %{SOURCE11} language/Japanese/strings.xml
-%{__mkdir} -p addons/skin.confluence/language/Japanese
-%{__cp} -f %{SOURCE12} addons/skin.confluence/language/Japanese/strings.xml
+#%{__cp} -f %{SOURCE11} language/Japanese/strings.xml
+#%{__mkdir} -p addons/skin.confluence/language/Japanese
+#%{__cp} -f %{SOURCE12} addons/skin.confluence/language/Japanese/strings.xml
 
 %build
 %ifarch x86_64
@@ -200,6 +210,9 @@ fi
 %{_mandir}/man1/*
 
 %changelog
+* Sun Feb 10 2013 MATSUBAYASHI Kohji <shaolin@vinelinux.org> - 12.0-1
+- new upstream release
+
 * Fri Mar 30 2012 MATSUBAYASHI Kohji <shaolin@vinelinux.org> - 11.0-5
 - fix silly typo in Source11