From: jongdong.lee Date: Fri, 21 Dec 2012 05:56:50 +0000 (+0900) Subject: update video-player manifast file. X-Git-Tag: 2.1b_release~1^2~21 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d07fc7ed02210c415f449942db4a91434a95d595;p=apps%2Fcore%2Fpreloaded%2Fvideo-player.git update video-player manifast file. Change-Id: Ifa78709fe63c77d5baf2d7f8dbbebffed55d3798 --- diff --git a/CMakeLists.txt b/CMakeLists.txt index f6942cc..8bbfa38 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -83,7 +83,7 @@ ADD_DEFINITIONS("-D_FILE_OFFSET_BITS=\"\"64") SET(PREFIX ${CMAKE_INSTALL_PREFIX}) SET(BINDIR "${PREFIX}/bin") SET(RESDIR "${PREFIX}/res") -SET(DATADIR "/opt/apps/org.tizen.video-player/data") +SET(THUMBDIR "/opt/usr/media/.video_thumb") SET(LOCALEDIR "${RESDIR}/locale") SET(ICONDIR "${RESDIR}/icons/default/small") SET(EDJDIR "${RESDIR}/edje") @@ -91,7 +91,7 @@ SET(SLP_LD_PATH_FLAGS -L${CMAKE_CURRENT_SOURCE_DIR}/src/ext) ADD_DEFINITIONS("-DPREFIX=\"${PREFIX}\"") ADD_DEFINITIONS("-DRESDIR=\"${RESDIR}\"") -ADD_DEFINITIONS("-DDATADIR=\"${DATADIR}\"") +ADD_DEFINITIONS("-DTHUMBDIR=\"${THUMBDIR}\"") ADD_DEFINITIONS("-DLOCALEDIR=\"${LOCALEDIR}\"") ADD_DEFINITIONS("-DICONDIR=\"${ICONDIR}\"") ADD_DEFINITIONS("-DEDJDIR=\"${EDJDIR}\"") @@ -192,7 +192,7 @@ ADD_DEPENDENCIES(${PROJECT_NAME} vp-volume-popup.edj) # install desktop file & icon, edje # ###################################### -INSTALL(DIRECTORY DESTINATION ${DATADIR}) +INSTALL(DIRECTORY DESTINATION ${THUMBDIR}) INSTALL(TARGETS ${PROJECT_NAME} DESTINATION bin) INSTALL(FILES ${CMAKE_BINARY_DIR}/res/edc/main.edj DESTINATION ${EDJDIR}) INSTALL(FILES ${CMAKE_BINARY_DIR}/res/edc/vp_font.edj DESTINATION ${EDJDIR}) @@ -207,10 +207,8 @@ INSTALL(FILES ${CMAKE_BINARY_DIR}/res/edc/option_button.edj DESTINATION ${EDJDIR INSTALL(FILES ${CMAKE_BINARY_DIR}/res/edc/popup_progressbar.edj DESTINATION ${EDJDIR}) INSTALL(FILES ${CMAKE_BINARY_DIR}/res/edc/vp-speedbox-popup.edj DESTINATION ${EDJDIR}) INSTALL(FILES ${CMAKE_BINARY_DIR}/res/edc/vp-volume-popup.edj DESTINATION ${EDJDIR}) - -INSTALL(FILES ${CMAKE_SOURCE_DIR}/org.tizen.video-player.xml DESTINATION /opt/share/packages) - -INSTALL(FILES ${CMAKE_SOURCE_DIR}/res/images/org.tizen.video-player.png DESTINATION /opt/share/icons/default/small/) +INSTALL(FILES ${CMAKE_SOURCE_DIR}/org.tizen.video-player.xml DESTINATION /usr/share/packages) +INSTALL(FILES ${CMAKE_SOURCE_DIR}/res/images/org.tizen.video-player.png DESTINATION /usr/share/icons/default/small/) INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/res/images/icon/ DESTINATION ${RESDIR}/images/icon) INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/res/images/toolbar/ DESTINATION ${RESDIR}/images/toolbar) diff --git a/debian/changelog b/debian/changelog deleted file mode 100755 index 9aa8b91..0000000 --- a/debian/changelog +++ /dev/null @@ -1,7 +0,0 @@ -video-player (0.1.5) unstable; urgency=low - - * Initial release. - * Git: pkgs/v/video-player - * Tag : video-player_0.1.5 - - -- jongdong.lee Tue, 06 Dec 2011 16:49:05 -0800 diff --git a/debian/compat b/debian/compat deleted file mode 100755 index 7ed6ff8..0000000 --- a/debian/compat +++ /dev/null @@ -1 +0,0 @@ -5 diff --git a/debian/control b/debian/control deleted file mode 100755 index f312da5..0000000 --- a/debian/control +++ /dev/null @@ -1,19 +0,0 @@ -Source: video-player -Section: video -Priority: optional -Maintainer: JongDong Lee , ChangSun Lee , JuBong Lee -Uploaders: JongDong Lee , ChangSun Lee , JuBong Lee -Build-Depends: debhelper (>= 5),libelm-dev, libappcore-efl-dev, libui-gadget-dev, libslp-utilx-dev, libmm-common-dev, libmm-player-dev, libmm-sound-dev, dlog-dev, libslp-pm-dev, libmm-session-dev, libmm-ta-dev, libmm-fileinfo-dev, libappcore-common-dev, libmedia-service-dev, libxml2-0, syspopup-caller-dev, libecore, libecore-file, libecore-imf, libecore-x, libecore-input, libecore-evas, libeina, libevas, libedje, libappsvc-dev, libail-0-dev, libefreet-dev, libicu-dev, execstack -Standards-Version: 3.7.2 - -Package: org.tizen.video-player -Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, libappcore-efl-0, libslp-utilx-0, libslp-sensor-0, libmm-common, libmm-player, libmm-log, libmm-ta, libmm-sound-0, libmm-fileinfo, libdlog-0, libmm-session-0, libslp-setting-0, libappcore-efl-0, libui-gadget-0, libmm-utility, libxml2-0, libmedia-service, libpng12-0, libappsvc-0, libail-0, libmedia-utils -Description: Video & streaming player - -Package: org.tizen.video-player-dbg -Section: debug -Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, org.tizen.video-player (= ${Source-Version}) -Description: Video & streaming player (unstripped) - diff --git a/debian/org.tizen.video-player.install b/debian/org.tizen.video-player.install deleted file mode 100755 index eb020fa..0000000 --- a/debian/org.tizen.video-player.install +++ /dev/null @@ -1,7 +0,0 @@ -/opt/apps/org.tizen.video-player/bin/* -/opt/apps/org.tizen.video-player/res/locale/* -/opt/apps/org.tizen.video-player/res/icons/default/small/* -/opt/apps/org.tizen.video-player/res/edje/* -/opt/apps/org.tizen.video-player/res/images/* -/opt/apps/org.tizen.video-player/data -/opt/share/applications/* diff --git a/debian/org.tizen.video-player.install.in b/debian/org.tizen.video-player.install.in deleted file mode 100755 index 0ac9b2d..0000000 --- a/debian/org.tizen.video-player.install.in +++ /dev/null @@ -1,7 +0,0 @@ -@PREFIX@/bin/* -@PREFIX@/res/locale/* -@PREFIX@/res/icons/default/small/* -@PREFIX@/res/edje/* -@PREFIX@/res/images/* -@PREFIX@/data -/opt/share/applications/* diff --git a/debian/org.tizen.video-player.postinst b/debian/org.tizen.video-player.postinst deleted file mode 100755 index 1c1810e..0000000 --- a/debian/org.tizen.video-player.postinst +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh -# Create a directory to store video-player bookmark pictures and stuffs. -# mkdir -p /opt/data/video-player - -if [ ${USER} == "root" ] -then - #chown 5000:5000 /opt/data/video-player - chown -R 5000:5000 /opt/apps/org.tizen.video-player/data - -fi diff --git a/debian/org.tizen.video-player.postinst.in b/debian/org.tizen.video-player.postinst.in deleted file mode 100755 index 1c1810e..0000000 --- a/debian/org.tizen.video-player.postinst.in +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh -# Create a directory to store video-player bookmark pictures and stuffs. -# mkdir -p /opt/data/video-player - -if [ ${USER} == "root" ] -then - #chown 5000:5000 /opt/data/video-player - chown -R 5000:5000 /opt/apps/org.tizen.video-player/data - -fi diff --git a/debian/rules b/debian/rules deleted file mode 100755 index 5097cee..0000000 --- a/debian/rules +++ /dev/null @@ -1,122 +0,0 @@ -#!/usr/bin/make -f -# -*- makefile -*- -# Sample debian/rules that uses debhelper. -# This file was originally written by Joey Hess and Craig Small. -# As a special exception, when this file is copied by dh-make into a -# dh-make output file, you may use that output file without restriction. -# This special exception was added by Craig Small in version 0.37 of dh-make. - -# Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 - - -CFLAGS += -Wall -g -LDFLAGS ?= -PREFIX ?= /opt/apps/org.tizen.video-player -RESDIR ?= /opt/apps/org.tizen.video-player/res -DATADIR ?= /opt/apps/org.tizen.video-player/data - -ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) - CFLAGS += -O0 -else - CFLAGS += -O2 -endif -CFLAGS += -fpie -LDFLAGS += -Wl,--rpath=$(PREFIX)/lib -Wl,--as-needed -pie - -configure: configure-stamp -configure-stamp: - dh_testdir - # Add here commands to configure the package. - CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" cmake . -DCMAKE_INSTALL_PREFIX=$(PREFIX) - - touch configure-stamp - - -build: build-stamp - -build-stamp: configure-stamp - dh_testdir - - # Add here commands to compile the package. - $(MAKE) - #docbook-to-man debian/video-player.sgml > video-player.1 - - for f in `find $(CURDIR)/debian/ -name "*.in"`; do \ - cat $$f > $${f%.in}; \ - sed -i -e "s#@PREFIX@#$(PREFIX)#g" $${f%.in}; \ - sed -i -e "s#@RESDIR@#$(RESDIR)#g" $${f%.in}; \ - sed -i -e "s#@DATADIR@#$(DATADIR)#g" $${f%.in}; \ - done - - touch $@ - -clean: - dh_testdir - dh_testroot - rm -f build-stamp configure-stamp - - # Add here commands to clean up after the build process. - -$(MAKE) clean - - find ./ -depth -type d -name "CMakeFiles" -exec rm {} -rf \; - find ./ -name "Makefile" -exec rm {} -f \; - find ./ -name "cmake_install.cmake" -exec rm {} -f \; - rm -rf CMakeCache.txt - rm -rf install_manifest.txt - rm -rf *.pc - rm -rf *.so - rm -rf org.tizen.video-player.desktop - rm -rf res/edc/*.edj - - dh_clean - -install: build - dh_testdir - dh_testroot - dh_clean -k - dh_installdirs - - # Add here commands to install the package into debian/video-player. - $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install - execstack -c $(CURDIR)/debian/tmp/opt/apps/org.tizen.video-player/bin/video-player - - -# Build architecture-independent files here. -binary-indep: build install -# We have nothing to do by default. - -# Build architecture-dependent files here. -binary-arch: build install - dh_testdir - dh_testroot - dh_installchangelogs - dh_installdocs - dh_installexamples - dh_install --sourcedir=debian/tmp -# dh_installmenu -# dh_installdebconf -# dh_installlogrotate -# dh_installemacsen -# dh_installpam -# dh_installmime -# dh_python -# dh_installinit -# dh_installcron -# dh_installinfo - dh_installman - dh_link -# dh_strip - dh_strip --dbg-package=org.tizen.video-player-dbg - dh_compress - dh_fixperms -# dh_perl -# dh_makeshlibs - dh_installdeb - dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb - -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install configure diff --git a/debian/substvars b/debian/substvars deleted file mode 100755 index 5c38c57..0000000 --- a/debian/substvars +++ /dev/null @@ -1 +0,0 @@ -shlibs:Depends=libdbus-1-0 (>= 1.1.1), libeet1, libeina-svn-04 (>= 0.0.2.062+svn20090910), libelm-svn-01, libembryo0, libglib2.0-0, libgstreamer-plugins-base0.10-0, libgstreamer0.10-0, libimlib2, zlib1g diff --git a/include/mp-video-value-define.h b/include/mp-video-value-define.h index a27aa69..6ce6855 100644 --- a/include/mp-video-value-define.h +++ b/include/mp-video-value-define.h @@ -47,12 +47,11 @@ #undef LOCALEDIR #endif -#define PREFIX "/usr/apps/com.samsung.video-player" -#define EDJ_PATH "/usr/apps/com.samsung.video-player/res/edje" -#define LOCALEDIR "/usr/apps/com.samsung.video-player/res/locale" +#define PREFIX "/usr/apps/org.tizen.video-player" +#define EDJ_PATH "/usr/apps/org.tizen.video-player/res/edje" +#define LOCALEDIR "/usr/apps/org.tizen.video-player/res/locale" + -#define VIDEO_BOOKMARK_DIR "/opt"PREFIX"/data" -#define VIDEO_TRIM_DATA_DIR "/opt"PREFIX"/data" #define VIDEO_CHAPTER_VIEW_DATA_DIR "/opt/usr/media/.video_thumb" diff --git a/org.tizen.video-player.xml b/org.tizen.video-player.xml index 7952607..9ca4b03 100755 --- a/org.tizen.video-player.xml +++ b/org.tizen.video-player.xml @@ -3,7 +3,7 @@ JongDong Lee Video player Application - + org.tizen.video-player.png diff --git a/packaging/org.tizen.video-player.spec b/packaging/org.tizen.video-player.spec old mode 100755 new mode 100644 index 7bea67b..ff616ef --- a/packaging/org.tizen.video-player.spec +++ b/packaging/org.tizen.video-player.spec @@ -58,14 +58,14 @@ Video & streaming player %endif %build -cmake . -DCMAKE_INSTALL_PREFIX=/opt/apps/org.tizen.video-player -DARCH=%{ARCH} +cmake . -DCMAKE_INSTALL_PREFIX=/usr/apps/org.tizen.video-player -DARCH=%{ARCH} make %{?jobs:-j%jobs} %install rm -rf %{buildroot} %make_install -execstack -c %{buildroot}/opt/apps/org.tizen.video-player/bin/video-player +execstack -c %{buildroot}/usr/apps/org.tizen.video-player/bin/video-player %post vconftool set -t bool db/private/org.tizen.video-player/backgroud_playing 0 -g 5000 @@ -80,14 +80,13 @@ vconftool set -t string db/private/org.tizen.video-player/preview_url_records "" vconftool set -t string db/private/org.tizen.video-player/show_indicator 1 -g 5000 vconftool set -t string db/private/org.tizen.video-player/show_border 0 -g 5000 -chown -R 5000:5000 /opt/apps/org.tizen.video-player/data - %files -n org.tizen.video-player %manifest org.tizen.video-player.manifest -%dir /opt/apps/org.tizen.video-player/data -/opt/apps/org.tizen.video-player/bin/* -/opt/apps/org.tizen.video-player/res/locale/* -/opt/share/icons/default/small/* -/opt/apps/org.tizen.video-player/res/edje/* -/opt/apps/org.tizen.video-player/res/images/* -/opt/share/packages/org.tizen.video-player.xml +%dir /opt/usr/media/.video_thumb + +/usr/apps/org.tizen.video-player/bin/* +/usr/apps/org.tizen.video-player/res/locale/* +/usr/share/icons/default/small/* +/usr/apps/org.tizen.video-player/res/edje/* +/usr/apps/org.tizen.video-player/res/images/* +/usr/share/packages/org.tizen.video-player.xml diff --git a/src/mp-external-ug.c b/src/mp-external-ug.c index b02cd5f..a738477 100644 --- a/src/mp-external-ug.c +++ b/src/mp-external-ug.c @@ -269,11 +269,11 @@ static void MpExternalUGAppSvcLoad(MpExternalUGType nExternalUGType, void *pUser switch(nExternalUGType) { case MP_EXTERNAL_UG_YOUTUBE: - strncpy(pkg_name,"com.samsung.youtube",STR_LEN_MAX-1); + strncpy(pkg_name,"org.tizen.youtube",STR_LEN_MAX-1); break; case MP_EXTERNAL_UG_FACEBOOK: - strncpy(pkg_name,"com.samsung.facebook",STR_LEN_MAX-1); + strncpy(pkg_name,"org.tizen.facebook",STR_LEN_MAX-1); break; default: break; diff --git a/src/mp-util.c b/src/mp-util.c index ef639d0..da8f968 100644 --- a/src/mp-util.c +++ b/src/mp-util.c @@ -43,7 +43,7 @@ #include "mp-video-string-define.h" //#include "mp-video-info-ctrl.h" -#define MP_LAUNCH_BLUETOOTH_PACKAGE_NAME "com.samsung.bluetooth" +#define MP_LAUNCH_BLUETOOTH_PACKAGE_NAME "org.tizen.bluetooth" #define MP_UTIL_USER_AGENT_KEY "db/admin/uagent" //#define MP_UTIL_TEMP_USER_AGENT_VALUE "User-Agent: Mozilla/5.0 (Linux; U; Android 2.2; en-gb; GT-I9000 Build/FROYO) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1" @@ -55,8 +55,8 @@ #define MP_UTIL_ALLSHARE_NOTI_ON 1 #define MP_UTIL_ALLSHARE_NOTI_OFF 0 -#define MP_UTIL_VCONF_KEY_PREVIEW_URL_VIDEOS "db/private/com.samsung.video-player/preview_url_videos" -#define MP_UTIL_VCONF_KEY_PREVIEW_URL_RECORDS "db/private/com.samsung.video-player/preview_url_records" +#define MP_UTIL_VCONF_KEY_PREVIEW_URL_VIDEOS "db/private/org.tizen.video-player/preview_url_videos" +#define MP_UTIL_VCONF_KEY_PREVIEW_URL_RECORDS "db/private/org.tizen.video-player/preview_url_records" static bool bAlphaSet = TRUE;