Request 228 - SailfishOS Open Build Service

Overview

Request 228 (accepted)

fixes

Created by sage almost 10 years ago
In state accepted

We truncated the diff of some files because they were too big. If you want to see the full diff for every file, click here.

Submit package nemo:devel:...9xx-common / libcmtspeechdata (revision 2) to package nemo:testin...9xx-common / libcmtspeechdata

[-] [+]	Changed	libcmtspeechdata.changes
@@ -1,3 +1,6 @@ +* Tue Apr 02 2013 Juho Hämäläinen <juho.hamalainen@tieto.com> - 2.0.8 +- Updated packaging, add patch to disable installation of test binaries. + * Thu Jan 10 2013 Marko Saukko <marko.saukko@jollamobile.com> - 2.0.8 - Updated packaging.
[-] [+]	Changed	libcmtspeechdata.spec ^
@@ -16,6 +16,7 @@ URL: http://meego.gitorious.org/meego-cellular/libcmtspeechdata Source0: meego-cellular-%{name}-v%{version}.tar.gz Source100: libcmtspeechdata.yaml +Patch0: 0001-Don-t-install-test-binaries.patch Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig BuildRequires: pkgconfig(check) @@ -54,6 +55,8 @@ %prep %setup -q -n meego-cellular-%{name} +# 0001-Don-t-install-test-binaries.patch +%patch0 -p1 # >> setup # << setup @@ -101,6 +104,4 @@ %{_includedir}/cmtspeech_msgs.h %{_libdir}/libcmtspeechdata-dummy/libcmtspeechdata.so %{_libdir}/libcmtspeechdata.so -%exclude %{_bindir}/cmtspeech_ramp_test -%exclude %{_bindir}/send_cmtspeech_reset # << files devel
[-] [+]	Added	0001-Don-t-install-test-binaries.patch ^
@@ -0,0 +1,37 @@ +From f0b7930aa8acb95c76393489561c94be26c247fb Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Juho=20H=C3=A4m=C3=A4l=C3=A4inen?= <juho.hamalainen@tieto.com> +Date: Tue, 2 Apr 2013 17:30:08 +0300 +Subject: [PATCH] Don't install test binaries. + +--- + Makefile.am \| 7 +++---- + 1 file changed, 3 insertions(+), 4 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index cb5e162..512e599 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -7,7 +7,9 @@ SUBDIRS = doc \ + + noinst_PROGRAMS = test_cmtspeech_msgs \ + test_ring \ +- test_cmtspeech ++ test_cmtspeech \ ++ cmtspeech_ramp_test \ ++ send_cmtspeech_reset + + TESTS = test_cmtspeech_msgs \ + test_ring +@@ -55,9 +57,6 @@ libcmtspeechdata_la_LDFLAGS = -Wl,--version-script,$(srcdir)/libcmtspeechdata.v + # test application sources + # ------------------------ + +-bin_PROGRAMS = send_cmtspeech_reset \ +- cmtspeech_ramp_test +- + noinst_HEADERS = $(cmtspeechdata_common_inc) \ + $(cmtspeech_data_kernel_inc) + +-- +1.7.10.4 +
[-] [+]	Changed	libcmtspeechdata.yaml ^
@@ -7,6 +7,8 @@ URL: http://meego.gitorious.org/meego-cellular/libcmtspeechdata Sources: - meego-cellular-%{name}-v%{version}.tar.gz +Patches: + - 0001-Don-t-install-test-binaries.patch Description: \| This package provides "libcmtspeechdata", an application engine (APE) side library, for the Nokia CMT Speech Data

Submit package nemo:devel:hw...:n9xx-common / ti-omap3-sgx (revision 2) to package nemo:testing:...:n9xx-common / ti-omap3-sgx

[-] [+]	Changed	ti-omap3-sgx.changes
@@ -1,3 +1,14 @@ +* Sat Apr 13 2013 Marko Saukko <marko.saukko@jollamobile.com> - 1.4.268.1 +- Add 0001-If-dir-and-or-file-doesn-t-exist-lets-not-cause-warn.patch to make warnings go away +- Merge libEGL, libGLESv1 and libGLESv2 to the main package as + all those binaries are needed by the pvrsinit script that is executed + after main package is installed. +- Ghost files that are created with pvrsrvinit script on the first run + so that they will be right even after updating the package +- Add 0001-Don-t-hide-error-messages.patch to show errors in journal when they happen +- Depend on kmod to make sure modprobe is available +- Force running of /usr/sbin/pvrsrvinit on package updates to make sure links are right + * Thu Nov 1 2012 Islam Amer <islam.amer@jollamobile.com> - 1.4.268 - Use systemd module loading to workaround startup race condition - Move modprobe omaplfb to after pvrsrvinit is done
[-] [+]	Changed	ti-omap3-sgx.spec ^
@@ -10,12 +10,12 @@ # << macros Summary: ImgTec SGX drivers for TI OMAP3 -Version: 1.4.268 -Release: 0 +Version: 1.4.268.1 +Release: 1 Group: Graphics/Display and Graphics Adaptation License: TI Proprietary ExclusiveArch: armv7hl armv7nhl armv7thl armv7tnhl armv8el -Source0: %{name}-bin-%{version}-armv7hl.tar.bz2 +Source0: %{name}-bin-1.4.268-armv7hl.tar.bz2 Source1: license.txt Source2: %{name}-powervr.ini Source3: %{name}.udev @@ -24,14 +24,29 @@ Source6: ti-omap3-sgx.conf Source7: ti-omap3-sgx-update.sh Source100: ti-omap3-sgx.yaml +Patch0: 0001-If-dir-and-or-file-doesn-t-exist-lets-not-cause-warn.patch +Patch1: 0001-Don-t-hide-error-messages.patch Requires: coreutils Requires: grep +Requires: kmod >= 9 Requires: systemd Requires(preun): systemd Requires(post): /sbin/ldconfig Requires(post): systemd Requires(postun): /sbin/ldconfig Requires(postun): systemd +Provides: libEGL +Provides: libEGL.so.1 +Provides: libGLESv1 +Provides: libGLES_CM.so.1 +Provides: libGLESv2 +Provides: libGLESv2.so.2 +Provides: %{name}-libEGL > 1.4.268 +Provides: %{name}-libGLESv1 > 1.4.268 +Provides: %{name}-libGLESv2 > 1.4.268 +Obsoletes: %{name}-libEGL <= 1.4.268 +Obsoletes: %{name}-libGLESv1 <= 1.4.268 +Obsoletes: %{name}-libGLESv2 <= 1.4.268 %description OMAP3 drivers for SGX @@ -45,85 +60,47 @@ This package provides common development files for PowerVR SGX. -%package libEGL -Summary: EGL for SGX -Group: Development/Libraries -Requires: %{name} = %{version}-%{release} -Requires(post): /sbin/ldconfig -Requires(postun): /sbin/ldconfig -Provides: libEGL -Provides: libEGL.so.1 - -%description libEGL -This package.. - - %package libEGL-devel Summary: EGL development headers for SGX Group: Development/Libraries Requires: %{name} = %{version}-%{release} -Requires: %{name}-libEGL = %{version}-%{release} Requires: %{name}-devel = %{version}-%{release} Provides: libEGL-devel %description libEGL-devel -This package.. - - -%package libGLESv1 -Summary: GLESv1 for SGX -Group: Development/Libraries -Requires: %{name} = %{version}-%{release} -Requires(post): /sbin/ldconfig -Requires(postun): /sbin/ldconfig -Provides: libGLESv1 -Provides: libGLES_CM.so.1 - -%description libGLESv1 -This package.. +%{summary}. %package libGLESv1-devel Summary: GLESv1 development headers for SGX Group: Development/Libraries Requires: %{name} = %{version}-%{release} -Requires: %{name}-libGLESv1 = %{version}-%{release} Requires: %{name}-devel = %{version}-%{release} Provides: libGLESv1-devel %description libGLESv1-devel -This package.. - - -%package libGLESv2 -Summary: GLESv2 for SGX -Group: Development/Libraries -Requires: %{name} = %{version}-%{release} -Requires(post): /sbin/ldconfig -Requires(postun): /sbin/ldconfig -Provides: libGLESv2 -Provides: libGLESv2.so.2 - -%description libGLESv2 -This package.. +%{summary}. %package libGLESv2-devel Summary: GLESv2 development headers for SGX Group: Development/Libraries Requires: %{name} = %{version}-%{release} -Requires: %{name}-libGLESv2 = %{version}-%{release} Requires: %{name}-devel = %{version}-%{release} Provides: libGLESv2-devel %description libGLESv2-devel -This package.. +%{summary}. %prep -%setup -q -n %{name}-bin-%{version}-armv7hl +%setup -q -n %{name}-bin-1.4.268-armv7hl +# 0001-If-dir-and-or-file-doesn-t-exist-lets-not-cause-warn.patch +%patch0 -p1 +# 0001-Don-t-hide-error-messages.patch +%patch1 -p1 # >> setup cp -v %{SOURCE1} . cp -v %{SOURCE5} . @@ -185,23 +162,17 @@ /sbin/ldconfig systemctl daemon-reload systemctl reload-or-try-restart %{name}.service +# << post +if [ "$1" -eq 2 ]; then +# on upgrades we want to make sure the links are pointing to right files +/usr/sbin/pvrsrvinit --force +fi +# >> post %postun /sbin/ldconfig systemctl daemon-reload -%post libEGL -p /sbin/ldconfig - -%postun libEGL -p /sbin/ldconfig - -%post libGLESv1 -p /sbin/ldconfig - -%postun libGLESv1 -p /sbin/ldconfig - -%post libGLESv2 -p /sbin/ldconfig - -%postun libGLESv2 -p /sbin/ldconfig - %files %defattr(-,root,root,-) # >> files @@ -209,24 +180,48 @@ %doc Meego_IMG-08172010-license_txt.doc %config %{_sysconfdir}/powervr.ini %config %{_sysconfdir}/udev/rules.d/10-pvrsrvkm.rules -%{_libdir}/libIMGegl.so -%{_libdir}/libPVRScopeServices.so -%{_libdir}/libglslcompiler.so -%{_libdir}/libpvr2d.so -%{_libdir}/libpvrPVR2D_BLITWSEGL.so -%{_libdir}/libpvrPVR2D_DRI2WSEGL.so -%{_libdir}/libpvrPVR2D_FLIPWSEGL.so -%{_libdir}/libpvrPVR2D_FRONTWSEGL.so -%{_libdir}/libpvrPVR2D_X11WSEGL.so -%{_libdir}/libsrv_um.so +%{_libdir}/libIMGegl_r12.so +%ghost %{_libdir}/libIMGegl.so +%{_libdir}/libPVRScopeServices_r12.so +%ghost %{_libdir}/libPVRScopeServices.so +%{_libdir}/libglslcompiler_r12.so +%ghost %{_libdir}/libglslcompiler.so +%{_libdir}/libpvr2d_r12.so +%ghost %{_libdir}/libpvr2d.so +%{_libdir}/libpvrPVR2D_BLITWSEGL_r12.so +%ghost %{_libdir}/libpvrPVR2D_BLITWSEGL.so +%{_libdir}/libpvrPVR2D_DRI2WSEGL_r12.so +%ghost %{_libdir}/libpvrPVR2D_DRI2WSEGL.so +%{_libdir}/libpvrPVR2D_FLIPWSEGL_r12.so +%ghost %{_libdir}/libpvrPVR2D_FLIPWSEGL.so +%{_libdir}/libpvrPVR2D_FRONTWSEGL_r12.so +%ghost %{_libdir}/libpvrPVR2D_FRONTWSEGL.so
[-] [+]	Added	0001-Don-t-hide-error-messages.patch ^
@@ -0,0 +1,50 @@ +From a00eb8a5050b1cf007db4db121558fe7bd8a97f7 Mon Sep 17 00:00:00 2001 +From: Marko Saukko <marko.saukko@jollamobile.com> +Date: Sat, 13 Apr 2013 20:24:45 +0000 +Subject: [PATCH] Don't hide error messages. + +Signed-off-by: Marko Saukko <marko.saukko@jollamobile.com> +--- + usr/sbin/pvrsrvinit \| 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/usr/sbin/pvrsrvinit b/usr/sbin/pvrsrvinit +index 9ef0715..a309efd 100755 +--- a/usr/sbin/pvrsrvinit ++++ b/usr/sbin/pvrsrvinit +@@ -52,7 +52,7 @@ activate_driver_for_core_rev() + test -f /targets/links/scratchbox.config && exit 0 + + if [ "$1" == "--force" ]; then +- modprobe pvrsrvkm &> /dev/null ++ modprobe pvrsrvkm + mkdir -p /var/lib/opengles-sgx-img + touch /var/lib/opengles-sgx-img/upgrade + else +@@ -61,7 +61,7 @@ fi + + if [ \! -f /proc/pvr/version ]; then + if [ "$1" != "--force" ]; then +- echo "SGX driver failed to initialize" > /dev/console ++ echo "SGX driver failed to initialize" + fi + exit 1 + fi +@@ -70,12 +70,12 @@ SGX_CORE_REV=$(grep -Eo "SGX revision = ([0-9][.][0-9][.][0-9])" \ + /proc/pvr/version \| cut -d= -f 2 \| tr -d ". ") + + if [ "$SGX_CORE_REV" = "" ]; then +- echo "Unable to determine SGX core revision" > /dev/console ++ echo "Unable to determine SGX core revision" + exit 1 + fi + + if [ \! -f /usr/sbin/pvrsrvinit_r$SGX_CORE_REV ]; then +- echo "Unsupported SGX core revision" > /dev/console ++ echo "Unsupported SGX core revision" + exit 1 + fi + +-- +1.7.10.3 +
[-] [+]	Added	0001-If-dir-and-or-file-doesn-t-exist-lets-not-cause-warn.patch ^
@@ -0,0 +1,27 @@ +From ce850ef2b5ce549a7a02a521e315e59318b15390 Mon Sep 17 00:00:00 2001 +From: Marko Saukko <marko.saukko@jollamobile.com> +Date: Sat, 13 Apr 2013 07:47:27 +0000 +Subject: [PATCH] If dir and/or file doesn't exist lets not cause warning. + +Signed-off-by: Marko Saukko <marko.saukko@jollamobile.com> +--- + usr/sbin/pvrsrvinit \| 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/usr/sbin/pvrsrvinit b/usr/sbin/pvrsrvinit +index d099b4e..9ef0715 100755 +--- a/usr/sbin/pvrsrvinit ++++ b/usr/sbin/pvrsrvinit +@@ -83,8 +83,7 @@ fi + if [ "$(readlink /usr/lib/libsrv_um.so)" != "libsrv_um_r${SGX_CORE_REV}.so" -o \ + -e /var/lib/opengles-sgx-img/upgrade ]; then + activate_driver_for_core_rev $SGX_CORE_REV +- rm /var/lib/opengles-sgx-img/upgrade +- rmdir /var/lib/opengles-sgx-img ++ rm -rf /var/lib/opengles-sgx-img + fi + + if [ "$1" != "--force" ]; then +-- +1.7.10.3 +
[-] [+]	Changed	ti-omap3-sgx.yaml ^
@@ -1,11 +1,11 @@ Name: ti-omap3-sgx Summary: ImgTec SGX drivers for TI OMAP3 -Version: 1.4.268 -Release: 0 +Version: 1.4.268.1 +Release: 1 Group: Graphics/Display and Graphics Adaptation License: TI Proprietary Sources: - - "%{name}-bin-%{version}-armv7hl.tar.bz2" + - "%{name}-bin-1.4.268-armv7hl.tar.bz2" - "license.txt" - "%{name}-powervr.ini" - "%{name}.udev" @@ -13,7 +13,9 @@ - "Meego_IMG-08172010-license_txt.doc" - "ti-omap3-sgx.conf" - "ti-omap3-sgx-update.sh" - +Patches: + - 0001-If-dir-and-or-file-doesn-t-exist-lets-not-cause-warn.patch + - 0001-Don-t-hide-error-messages.patch Description: OMAP3 drivers for SGX Configure: none Builder: none @@ -22,6 +24,23 @@ # mkdir, touch, grep required for pvrsrvinit - coreutils - grep + # modprobe + - kmod >= 9 +Provides: + - libEGL + - libEGL.so.1 + - libGLESv1 + - libGLES_CM.so.1 + - libGLESv2 + - libGLESv2.so.2 + - "%{name}-libEGL > 1.4.268" + - "%{name}-libGLESv1 > 1.4.268" + - "%{name}-libGLESv2 > 1.4.268" +Obsoletes: + - "%{name}-libEGL <= 1.4.268" + - "%{name}-libGLESv1 <= 1.4.268" + - "%{name}-libGLESv2 <= 1.4.268" + SubPackages: - Name: devel Summary: PowerVR SGX support development files @@ -29,62 +48,32 @@ Description: \| This package provides common development files for PowerVR SGX. - - Name: libEGL - Summary: EGL for SGX - Group: Development/Libraries - Description: \| - This package.. - Provides: - - libEGL - - libEGL.so.1 - - Name: libEGL-devel Summary: EGL development headers for SGX Group: Development/Libraries Description: \| - This package.. + %{summary}. Requires: - - "%{name}-libEGL = %{version}-%{release}" - "%{name}-devel = %{version}-%{release}" Provides: - libEGL-devel - - Name: libGLESv1 - Summary: GLESv1 for SGX - Group: Development/Libraries - Description: \| - This package.. - Provides: - - libGLESv1 - - libGLES_CM.so.1 - - Name: libGLESv1-devel Summary: GLESv1 development headers for SGX Group: Development/Libraries Description: \| - This package.. + %{summary}. Requires: - - "%{name}-libGLESv1 = %{version}-%{release}" - "%{name}-devel = %{version}-%{release}" Provides: - libGLESv1-devel - - Name: libGLESv2 - Summary: GLESv2 for SGX - Group: Development/Libraries - Description: \| - This package.. - Provides: - - libGLESv2 - - libGLESv2.so.2 - - Name: libGLESv2-devel Summary: GLESv2 development headers for SGX Group: Development/Libraries Description: \| - This package.. + %{summary}. Requires: - - "%{name}-libGLESv2 = %{version}-%{release}" - "%{name}-devel = %{version}-%{release}" Provides: - libGLESv2-devel

Comments for request 228 (0)

There's nothing to be done right now

Request History

sage	created request	1401982119 almost 10 years ago
fixes
cibot	Request got a new review request	1366204539 about 11 years ago
Under automated review
cibot	Request got reviewed	1366205966 about 11 years ago
Prechecks succeeded.
cibot	Request got a new review request	1366205967 about 11 years ago
Please replace this text with a review and appro [+]
sage	Request got reviewed	1366206060 about 11 years ago
ok
cibot	Request got a new review request	1366206064 about 11 years ago
Build trial in progress at https://build.merproj [+]
cibot	Request got reviewed	1366206534 about 11 years ago
Build trial succeeded.
cibot	Request got accepted	1366206538 about 11 years ago
BOSS accepted this request because: Trial build [+]
cibot	Review got accepted	1401982119 almost 10 years ago
Prechecks succeeded.
sage	Review got accepted	1401982119 almost 10 years ago
ok
cibot	Review got accepted	1401982119 almost 10 years ago
Build trial succeeded.

Request 228 (accepted)

Comments for request 228 (0)

Request History

0 Package Maintainers