summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeoffroy Van Cutsem <geoffroy.vancutsem@intel.com>2012-10-24 10:44:23 +0200
committerGeoffroy Van Cutsem <geoffroy.vancutsem@intel.com>2012-10-24 10:52:26 +0200
commit37e3de1b491c0d20d0cccd43727a2aa62783f4cc (patch)
treeb9d7d9fc5a299e59b998728d63f652c5cec9c743
parent5d8d824b5c0790994554eefce9485514ab3eccb1 (diff)
downloadivi-demo-config-37e3de1b491c0d20d0cccd43727a2aa62783f4cc.tar.gz
ivi-demo-config-37e3de1b491c0d20d0cccd43727a2aa62783f4cc.tar.bz2
ivi-demo-config-37e3de1b491c0d20d0cccd43727a2aa62783f4cc.zip
Update start_video.sh script to play all four videos from sample-media
Turn off gpgcheck for tizen-ivi-demo.repo Replace one hardcoded path by macro in spec file Signed-off-by: Geoffroy Van Cutsem <geoffroy.vancutsem@intel.com> Change-Id: I9a6807e668cc6e12f33ed8478a8b1ff6d9110f24
-rw-r--r--packaging/ivi-demo-config.changes6
-rw-r--r--packaging/ivi-demo-config.spec5
-rw-r--r--packaging/start_video.sh6
-rw-r--r--packaging/tizen-ivi-demo.repo2
4 files changed, 11 insertions, 8 deletions
diff --git a/packaging/ivi-demo-config.changes b/packaging/ivi-demo-config.changes
index 485f99d..2281d57 100644
--- a/packaging/ivi-demo-config.changes
+++ b/packaging/ivi-demo-config.changes
@@ -1,3 +1,9 @@
+* Wed Oct 24 2012 Geoffroy Van Cutsem <geoffroy.vancutsem@intel.com> submit/trunk/20121023.171342@0dcf99b
+- Update start_video.sh script to play all four videos from sample-media
+- Turn off gpgcheck for tizen-ivi-demo.repo
+- Replace one hardcoded path by macro in spec file
+- Adding connman settings file (WiFi is on by default)
+
* Tue Oct 09 2012 Geoffroy Van Cutsem <geoffroy.vancutsem@intel.com> submit/trunk/20121009.044154@c8f38f7
- Add function ('Button2') to skip to next video on the list
- Fix machine-info file (use correct PRETTY_HOSTNAME)
diff --git a/packaging/ivi-demo-config.spec b/packaging/ivi-demo-config.spec
index 822d5f2..de6eac3 100644
--- a/packaging/ivi-demo-config.spec
+++ b/packaging/ivi-demo-config.spec
@@ -1,6 +1,6 @@
Name: ivi-demo-config
Summary: Custom configs for Tizen IVI demos
-Version: 0.0.4
+Version: 0.0.5
Release: 1
Group: System Environment/Libraries
License: Apache License, Version 2.0
@@ -13,7 +13,6 @@ Source4: settings
Source5: tizen-base.repo
Source6: tizen-ivi-demo.repo
Source7: tizen-ivi.repo
-#Conflicts: wayland
%description
Provides customizations for Tizen IVI demos
@@ -57,5 +56,5 @@ fi
%config %{_sysconfdir}/X11/xorg.conf
%config %{_sysconfdir}/ambd/config
%{_libdir}/automotive-message-broker/scripts/*
-/etc/zypp/repos.d/*
+%{_sysconfdir}/zypp/repos.d/*
/var/lib/connman/settings
diff --git a/packaging/start_video.sh b/packaging/start_video.sh
index 1ac9d47..c31cb6a 100644
--- a/packaging/start_video.sh
+++ b/packaging/start_video.sh
@@ -1,8 +1,6 @@
#!/bin/bash
-#while true ;
-# do
-# gst-launch-0.10 playbin2 uri=file:///root/videos/The_Magic_of_Flight_720p.mp4 ;
gst-launch-0.10 filesrc location=/usr/share/sample-media/Visual_Dreams_720.mp4 ! qtdemux ! vaapidecode ! vaapisink fullscreen=true ;
gst-launch-0.10 filesrc location=/usr/share/sample-media/sintel_720.mp4 ! qtdemux ! vaapidecode ! vaapisink fullscreen=true ;
-#done
+ gst-launch-0.10 filesrc location=/usr/share/sample-media/BigBuckBunny_512kb.mp4 ! qtdemux ! vaapidecode ! vaapisink fullscreen=true ;
+ gst-launch-0.10 filesrc location=/usr/share/sample-media/Rico_Star.mp4 ! qtdemux ! vaapidecode ! vaapisink fullscreen=true ;
diff --git a/packaging/tizen-ivi-demo.repo b/packaging/tizen-ivi-demo.repo
index 6cfd9fc..84df727 100644
--- a/packaging/tizen-ivi-demo.repo
+++ b/packaging/tizen-ivi-demo.repo
@@ -2,5 +2,5 @@
name=Packages dedicated to showcase Tizen:IVI demos (Tizen_IVI_standard)
type=rpm-md
baseurl=http://download.tizen.org/live/Tizen:/IVI:/demo/Tizen_IVI_standard/
-gpgcheck=1
+gpgcheck=0
enabled=1