From 32d3066578139257bfa6879b1285aefe5bd9b1da Mon Sep 17 00:00:00 2001 From: Kim Kibum Date: Sun, 29 Apr 2012 17:01:19 +0900 Subject: [PATCH] upload tizen1.0 source --- configure.ac | 4 ++++ debian/changelog | 16 ++++++++++++++++ debian/control | 6 +++--- packaging/libmm-player.spec | 26 +++++++++++++++++--------- src/Makefile.am | 2 ++ src/include/mm_player_ini.h | 4 ---- src/mm_player_attrs.c | 5 +++-- src/mm_player_utils.c | 3 ++- 8 files changed, 47 insertions(+), 19 deletions(-) diff --git a/configure.ac b/configure.ac index cf12ae7..60d06d4 100755 --- a/configure.ac +++ b/configure.ac @@ -112,6 +112,10 @@ PKG_CHECK_MODULES(CRYPTO, libcrypto) AC_SUBST(CRYPTO_CFLAGS) AC_SUBST(CRYPTO_LIBS) +PKG_CHECK_MODULES(VCONF, vconf) +AC_SUBST(VCONF_CFLAGS) +AC_SUBST(VCONF_LIBS) + AC_ARG_ENABLE(sdk, AC_HELP_STRING([--enable-sdk], [sdk build]), [ case "${enableval}" in diff --git a/debian/changelog b/debian/changelog index 0c13864..8728c38 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,19 @@ +libmm-player (0.2.14-0) unstable; urgency=low + + * Fix UA/Proxy default value to be set using vconf + * Git: pkgs/l/libmm-player + * Tag: libmm-player_0.2.14-0 + + -- YeJin Cho Wed, 21 Mar 2012 14:48:09 +0900 + +libmm-player (0.2.13-0) unstable; urgency=low + + * Change ini default file path + * Git: pkgs/l/libmm-player + * Tag: libmm-player_0.2.13-0 + + -- YeJin Cho Wed, 21 Mar 2012 14:38:53 +0900 + libmm-player (0.2.12-0) unstable; urgency=low * update to latest code diff --git a/debian/control b/debian/control index a8c61e7..07e055a 100755 --- a/debian/control +++ b/debian/control @@ -4,20 +4,20 @@ Priority: extra Maintainer: Shin Seung Bae , JongHyuk Choi Uploaders: Young Hwan Ahn Cho Ye Jin , KwangHui Cho , Jeon Hee Chul , Wonhyung Cho -Build-Depends: debhelper (>= 5), autotools-dev, libmm-log-dev, libmm-common-dev, libgstreamer0.10-dev, libgstreamer-plugins-base0.10-dev, iniparser-dev, libmm-sound-dev, libmm-ta-dev, libappcore-efl-dev, libefreet-dev, libmm-session-dev, libaudiosessionmgr-dev (>=0.1.1), libmm-utility-dev, libmm-common-internal-dev +Build-Depends: debhelper (>= 5), autotools-dev, libmm-log-dev, libmm-common-dev, libgstreamer0.10-dev, libgstreamer-plugins-base0.10-dev, iniparser-dev, libmm-sound-dev, libmm-ta-dev, libappcore-efl-dev, libefreet-dev, libmm-session-dev, libaudiosessionmgr-dev (>=0.1.1), libmm-utility-dev, libmm-common-internal-dev, libvconf-dev Standards-Version: 3.7.2 Package: libmm-player Section: libs Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, libmm-log, libmm-common, libgstreamer0.10-0, libgstreamer-plugins-base0.10-0, libmm-ta, libmm-session-0, libaudiosessionmgr-0 (>=0.1.1), pulseaudio, pulseaudio-module-bluetooth[armel], libmm-utility +Depends: ${shlibs:Depends}, ${misc:Depends}, libmm-log, libmm-common, libgstreamer0.10-0, libgstreamer-plugins-base0.10-0, libmm-ta, libmm-session-0, libaudiosessionmgr-0 (>=0.1.1), pulseaudio, pulseaudio-module-bluetooth[armel], libmm-utility, libvconf-0 Description: Multimedia Framework Player Library Package: libmm-player-dev XB-Generate-Docs: yes Section: libdevel Architecture: any -Depends: libmm-player (= ${Source-Version}), libmm-log-sdk-dev, libmm-common-dev, libgstreamer0.10-sdk-dev, libgstreamer-plugins-base0.10-sdk-dev, libmm-sound-sdk-dev, libmm-ta-sdk-dev, libmm-session-sdk-dev, libaudiosessionmgr-sdk-dev (>=0.1.1), libmm-utility-dev +Depends: libmm-player (= ${Source-Version}), libmm-log-sdk-dev, libmm-common-dev, libgstreamer0.10-sdk-dev, libgstreamer-plugins-base0.10-sdk-dev, libmm-sound-sdk-dev, libmm-ta-sdk-dev, libmm-session-sdk-dev, libaudiosessionmgr-sdk-dev (>=0.1.1), libmm-utility-dev, libvconf-dev Description: Multimedia Framework Player Library (DEV) Package: libmm-player-internal-dev diff --git a/packaging/libmm-player.spec b/packaging/libmm-player.spec index e54e5e3..a7b9257 100644 --- a/packaging/libmm-player.spec +++ b/packaging/libmm-player.spec @@ -5,11 +5,10 @@ Release: 1 Group: System/Libraries License: Apache-2.0 Source0: %{name}-%{version}.tar.gz -Patch0: 0001-enable-attrs-get-for-ximagesink.patch Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig BuildRequires: pkgconfig(mm-ta) -BuildRequires: pkgconfig(mm-common), libmm-common-internal-devel +BuildRequires: pkgconfig(mm-common) BuildRequires: pkgconfig(mm-sound) BuildRequires: pkgconfig(gstreamer-0.10) BuildRequires: pkgconfig(gstreamer-plugins-base-0.10) @@ -24,6 +23,10 @@ BuildRequires: pkgconfig(ecore-x) BuildRequires: pkgconfig(evas) BuildRequires: pkgconfig(iniparser) BuildRequires: pkgconfig(libcrypto) +BuildRequires: pkgconfig(vconf) + + +BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -34,10 +37,8 @@ Requires: %{name} = %{version}-%{release} %description devel - %prep %setup -q -%patch0 -p1 %build @@ -46,8 +47,11 @@ Requires: %{name} = %{version}-%{release} CFLAGS+=" -DMMFW_DEBUG_MODE -DGST_EXT_TIME_ANALYSIS -DAUDIO_FILTER_EFFECT -DEXPORT_API=\"__attribute__((visibility(\\\"default\\\")))\" "; export CFLAGS LDFLAGS+="-Wl,--rpath=%{_prefix}/lib -Wl,--hash-style=both -Wl,--as-needed"; export LDFLAGS -%configure --prefix=%{_prefix} -make +# always enable sdk build. This option should go away +CFLAGS=$CLFAGS LDFLAGS=$LDFLAGS ./configure --enable-sdk --prefix=%{_prefix} --disable-static + +# Call make instruction with smp support +make -j1 %install rm -rf %{buildroot} @@ -55,6 +59,10 @@ rm -rf %{buildroot} rm -f %{buildroot}/usr/bin/test_alarmdb +%clean +rm -rf %{buildroot} + + %post -p /sbin/ldconfig @@ -62,15 +70,15 @@ rm -f %{buildroot}/usr/bin/test_alarmdb %files +%defattr(-,root,root,-) %{_libdir}/*.so.* %{_bindir}/* %files devel +%defattr(-,root,root,-) %{_libdir}/*.so -%{_includedir}/mmf/mm_player.h -%{_includedir}/mmf/mm_player_sndeffect.h -%{_includedir}/mmf/mm_player_internal.h +%{_includedir}/mmf/*.h %{_libdir}/pkgconfig/*.pc diff --git a/src/Makefile.am b/src/Makefile.am index 12d68c9..96ecceb 100755 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -42,6 +42,7 @@ libmmfplayer_la_CFLAGS = -I$(srcdir)/include \ $(GST_APP_CFLAGS) \ $(MMSESSION_CFLAGS) \ $(AUDIOSESSIONMGR_CFLAGS) \ + $(VCONF_CFLAGS) \ $(CRYPTO_CFLAGS) noinst_HEADERS += include/mm_player_utils.h \ @@ -67,6 +68,7 @@ libmmfplayer_la_LIBADD = $(GST_LIBS) \ $(CRYPTO_LIBS) \ $(MMSESSION_LIBS) \ $(AUDIOSESSIONMGR_LIBS) \ + $(VCONF_LIBS) \ $(top_builddir)/src/libmmfplayer_m3u8.la libmmfplayer_la_CFLAGS += $(MMLOG_CFLAGS) -DMMF_LOG_OWNER=0x008 -DMMF_DEBUG_PREFIX=\"MMF-PLAYER\" -D_INTERNAL_SESSION_MANAGER_ diff --git a/src/include/mm_player_ini.h b/src/include/mm_player_ini.h index 57a3b9e..f133161 100755 --- a/src/include/mm_player_ini.h +++ b/src/include/mm_player_ini.h @@ -30,11 +30,7 @@ #endif -#if defined(MMFW_DEBUG_MODE) -#define MM_PLAYER_INI_DEFAULT_PATH "/opt/etc/mmfw_player.ini" -#else #define MM_PLAYER_INI_DEFAULT_PATH "/usr/etc/mmfw_player.ini" -#endif #define PLAYER_INI() mm_player_ini_get_structure() diff --git a/src/mm_player_attrs.c b/src/mm_player_attrs.c index 543ccc6..d038d94 100755 --- a/src/mm_player_attrs.c +++ b/src/mm_player_attrs.c @@ -25,6 +25,7 @@ | INCLUDE FILES | | | ========================================================================================== */ +#include #include "mm_player_priv.h" #include "mm_player_attrs.h" #include @@ -309,11 +310,11 @@ _mmplayer_construct_attribute(mm_player_t* player) /*streaming */ {"streaming_type", MM_ATTRS_TYPE_INT, MM_ATTRS_FLAG_RW, (void *) STREAMING_SERVICE_NONE }, {"streaming_udp_timeout", MM_ATTRS_TYPE_INT, MM_ATTRS_FLAG_RW, (void *)10000}, - {"streaming_user_agent", MM_ATTRS_TYPE_STRING, MM_ATTRS_FLAG_RW, (void *)NULL}, + {"streaming_user_agent", MM_ATTRS_TYPE_STRING, MM_ATTRS_FLAG_RW, (void *) vconf_get_str(VCONFKEY_ADMIN_UAGENT)}, {"streaming_wap_profile", MM_ATTRS_TYPE_STRING, MM_ATTRS_FLAG_RW, (void *)NULL}, {"streaming_network_bandwidth", MM_ATTRS_TYPE_INT, MM_ATTRS_FLAG_RW, (void *)128000}, {"streaming_cookie", MM_ATTRS_TYPE_STRING, MM_ATTRS_FLAG_RW, (void *)NULL}, - {"streaming_proxy", MM_ATTRS_TYPE_STRING, MM_ATTRS_FLAG_RW, (void *)NULL}, + {"streaming_proxy", MM_ATTRS_TYPE_STRING, MM_ATTRS_FLAG_RW, (void *) vconf_get_str(VCONFKEY_NETWORK_PROXY)}, /* subtitle */ {"subtitle_uri", MM_ATTRS_TYPE_STRING, MM_ATTRS_FLAG_RW, (void *)NULL}, {"subtitle_silent", MM_ATTRS_TYPE_INT, MM_ATTRS_FLAG_RW, (void *)0}, diff --git a/src/mm_player_utils.c b/src/mm_player_utils.c index 80d1044..2c79d08 100755 --- a/src/mm_player_utils.c +++ b/src/mm_player_utils.c @@ -280,8 +280,9 @@ bool util_check_valid_url ( const char *proxy ) bool ret = TRUE; return_val_if_fail ( proxy, FALSE ); + return_val_if_fail ( strlen(proxy), FALSE ); - if ( inet_aton(proxy, &proxy_addr) != 0 ) + if ( inet_aton(proxy, &proxy_addr) != 0 ) { debug_warning("invalid proxy is set. \n"); ret = FALSE; -- 2.7.4