From: Seonmi Jin Date: Wed, 6 Apr 2016 06:30:43 +0000 (+0900) Subject: [TV] Modified pulseaudio.service for TV profile X-Git-Tag: accepted/tizen/common/20160504.125004^0 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=765a7e39112b82301de0e6496ffd5c699bd779fc;p=platform%2Fupstream%2Fpulseaudio.git [TV] Modified pulseaudio.service for TV profile [Version] 5.0-68 [Profile] TV [Issue Type] Code merge Change-Id: Ib7433d694f9b34b8e127db757bf0340c10984f9d Signed-off-by: Seonmi Jin --- diff --git a/packaging/pulseaudio.spec b/packaging/pulseaudio.spec index ce76c01..a020923 100644 --- a/packaging/pulseaudio.spec +++ b/packaging/pulseaudio.spec @@ -10,7 +10,7 @@ Name: pulseaudio Summary: Improved Linux sound server Version: 5.0 -Release: 67 +Release: 68 Group: Multimedia/Audio License: LGPL-2.1+ URL: http://pulseaudio.org @@ -194,6 +194,9 @@ PulseAudio realtime-scheduling. %setup -q -T -b0 echo "%{version}" > .tarball-version cp %{SOURCE1001} . +%if "%{?tizen_profile_name}" == "tv" +cp src/daemon/systemd/system/pulseaudio-tv.service.in src/daemon/systemd/system/pulseaudio.service.in +%endif %build export CFLAGS="%{optflags} -fno-strict-aliasing -D__TIZEN__ -D__TIZEN_BT__ -D__TIZEN_LOG__ -DTIZEN_MICRO -DBLUETOOTH_APTX_SUPPORT" @@ -204,11 +207,16 @@ export FFLAGS="$FFLAGS -DTIZEN_DEBUG_ENABLE" %endif %if "%{?tizen_profile_name}" == "wearable" - echo "tizen profile werable" - export CFLAGS+=" -DTIZEN_MICRO -DPM_ASYNC -DADJUST_ANDROID_BITPOOL" +echo "tizen profile werable" +export CFLAGS+=" -DTIZEN_MICRO -DPM_ASYNC -DADJUST_ANDROID_BITPOOL" + %else if "%{?tizen_profile_name}" == "mobile" - echo "tizen profile mobile" - export CFLAGS+=" -DTIZEN_MOBILE -DPM_ASYNC " +echo "tizen profile mobile" +export CFLAGS+=" -DTIZEN_MOBILE -DPM_ASYNC " + +%else if "%{?tizen_profile_name}" == "tv" +echo "tizen profile tv" +export CFLAGS+=" -DTIZEN_TV " %endif export LD_AS_NEEDED=0 @@ -276,8 +284,13 @@ mkdir -p %{buildroot}%{_includedir}/pulsemodule/pulsecore cp %{buildroot}%{_includedir}/pulse/*.h %{buildroot}%{_includedir}/pulsemodule/pulse +%if "%{?tizen_profile_name}" == "tv" +mkdir -p %{buildroot}%{_unitdir}/sysinit.target.wants/ +ln -s ../pulseaudio.service %{buildroot}%{_unitdir}/sysinit.target.wants/pulseaudio.service +%else mkdir -p %{buildroot}%{_unitdir}/multi-user.target.wants/ ln -s ../pulseaudio.service %{buildroot}%{_unitdir}/multi-user.target.wants/pulseaudio.service +%endif fdupes %{buildroot}%{_datadir} fdupes %{buildroot}%{_includedir} @@ -424,7 +437,11 @@ fi %{_unitdir_user}/pulseaudio.service %{_unitdir_user}/pulseaudio.socket %{_unitdir}/pulseaudio.service +%if "%{?tizen_profile_name}" == "tv" +%{_unitdir}/sysinit.target.wants/pulseaudio.service +%else %{_unitdir}/multi-user.target.wants/pulseaudio.service +%endif %{_libdir}/pulse-%{version}/modules/libvolume-api.so %{_libdir}/pulse-%{version}/modules/libmain-volume-policy.so %{_libdir}/pulse-%{version}/modules/module-volume-api.so diff --git a/src/Makefile.am b/src/Makefile.am index 66687ed..40c48fb 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -105,6 +105,7 @@ EXTRA_DIST = \ daemon/start-pulseaudio-x11.in \ daemon/start-pulseaudio-kde.in \ daemon/systemd/system/pulseaudio.service.in \ + daemon/systemd/system/pulseaudio-tv.service.in \ daemon/systemd/system/pulseaudio.socket \ daemon/systemd/user/pulseaudio.service.in \ daemon/systemd/user/pulseaudio.socket \ diff --git a/src/daemon/systemd/system/pulseaudio-tv.service.in b/src/daemon/systemd/system/pulseaudio-tv.service.in new file mode 100644 index 0000000..975dcfe --- /dev/null +++ b/src/daemon/systemd/system/pulseaudio-tv.service.in @@ -0,0 +1,12 @@ +[Unit] +Description=pulseaudio service +DefaultDependencies=false +After=factory-init.service dbus.service + +[Service] +Type=forking +ExecStart=/usr/bin/pulseaudio +Restart=always +KillSignal=SIGKILL +MemoryLimit=50M +PIDFile=/var/run/pulse/pid