diff -Nru libomxil-bellagio-0.9.3/debian/changelog libomxil-bellagio-0.9.3/debian/changelog --- libomxil-bellagio-0.9.3/debian/changelog 2014-02-19 20:37:37.000000000 +0100 +++ libomxil-bellagio-0.9.3/debian/changelog 2014-03-03 22:23:23.000000000 +0100 @@ -1,3 +1,22 @@ +libomxil-bellagio (0.9.3-2ubuntu1) trusty; urgency=low + + * Merge from Debian testing (LP: #1279946). Remaining changes: + + debian/control: + - added the package libomxil-bellagio-bin + + debian/libomxil-bellagio-bin.install: + - install file for binary package + + debian/libomxil-bellagio0.install: + - updated to contain only libs + + removed debian/libomxil-bellagio0.links + + refreshed patch 0101_unused_variables.patch + + drop patch 0006_fix_FTBFS_for_gcc4.6.patch, Debian has set + -Wno-error on unused-but-set-variable and unused-but-set-parameter. + However, this issue is already fixed in unused_variables.patch + + make libomxil-bellagio0 depend on libomxil-bellagio-bin, as it + calls binaries from the latter in its postinst + + -- Leo Iannacone Mon, 03 Mar 2014 21:59:48 +0100 + libomxil-bellagio (0.9.3-2) unstable; urgency=medium * Fix FTBFS. (Closes: #738394) @@ -10,6 +29,31 @@ -- Ying-Chun Liu (PaulLiu) Thu, 20 Feb 2014 03:36:26 +0800 +libomxil-bellagio (0.9.3-1ubuntu2) precise; urgency=low + + * Make libomxil-bellagio0 depend on libomxil-bellagio-bin, as it + calls binaries from the latter in its postinst (LP: #921523) + + -- Adam Conrad Sat, 07 Apr 2012 16:40:49 -0600 + +libomxil-bellagio (0.9.3-1ubuntu1) precise; urgency=low + + * Merge from Debian testing (LP: #913513). Remaining changes: + + debian/control: + - added the package libomxil-bellagio-bin + + debian/libomxil-bellagio-bin.install: + - install file for binary package + + debian/libomxil-bellagio0.install: + - updated to contain only libs + + removed debian/libomxil-bellagio0.links + + refreshed patch 0101_unused_variables.patch + * Drop patch 0006_fix_FTBFS_for_gcc4.6.patch, Debian has set + -Wno-error on unused-but-set-variable and unused-but-set-parameter. + However, this issue is already fixed in unused_variables.patch + (closes: #625367) + + -- Leo Iannacone Sun, 08 Jan 2012 19:45:16 +0100 + libomxil-bellagio (0.9.3-1) unstable; urgency=low * New upstream release 0.9.3 @@ -21,6 +65,34 @@ -- Ying-Chun Liu (PaulLiu) Tue, 19 Jul 2011 11:44:44 +0800 +libomxil-bellagio (0.9.2.1-git.20101216t085958.772f0ec-0ubuntu3) oneiric; urgency=low + + * Remove unused variables to placate gcc-4.6 -Werror (LP: #831282). + + -- Colin Watson Wed, 14 Sep 2011 15:23:18 +0100 + +libomxil-bellagio (0.9.2.1-git.20101216t085958.772f0ec-0ubuntu2) natty; urgency=low + + * debian/control + - added the package libomxil-bellagio-bin + + * debian/rules + - removed override_auto_test + + * debian/libomxil-bellagio-bin.install + - install file for binary package + + * debian/patches/test_build.patch + - patch to change include and library path + + -- Kunal Goel Mon, 07 Feb 2011 23:50:42 +0530 + +libomxil-bellagio (0.9.2.1-git.20101216t085958.772f0ec-0ubuntu1) natty; urgency=low + + * Initial release for 0.9.2.1 + + -- Kunal Goel Wed, 12 Jan 2011 16:17:02 -0600 + libomxil-bellagio (0.9.2.1+git20110117.863d289e-1) unstable; urgency=low * Pack from upstream latest git tree. @@ -62,3 +134,4 @@ * Initial Debian release (Closes: #456911). -- Marc-Andre Lureau Tue, 23 Sep 2008 15:54:28 +0300 + diff -Nru libomxil-bellagio-0.9.3/debian/control libomxil-bellagio-0.9.3/debian/control --- libomxil-bellagio-0.9.3/debian/control 2014-02-19 20:00:35.000000000 +0100 +++ libomxil-bellagio-0.9.3/debian/control 2014-02-20 05:11:59.000000000 +0100 @@ -1,7 +1,8 @@ Source: libomxil-bellagio Section: libs Priority: optional -Maintainer: Ying-Chun Liu (PaulLiu) +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Ying-Chun Liu (PaulLiu) Build-Depends: debhelper (>= 7.0.50~), dh-autoreconf, autotools-dev, libasound2-dev, libmad0-dev, libvorbis-dev, libavcodec-dev, libavformat-dev, libavutil-dev, doxygen, libjs-jquery @@ -14,7 +15,7 @@ Suggests: libomxil-bellagio0-components-base Architecture: any Section: libs -Depends: ${shlibs:Depends}, ${misc:Depends} +Depends: ${shlibs:Depends}, ${misc:Depends}, libomxil-bellagio-bin (= ${binary:Version}) Description: implementation of OpenMAX IL, run-time library OpenMAX Integration Layer (IL) is a standard API to access Multimedia Components on mobile platforms. It has been defined by the Khronos @@ -99,3 +100,12 @@ start developing components. . This package contains the HTML documentation. + +Package: libomxil-bellagio-bin +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, libomxil-bellagio0 (= ${binary:Version}) +Description: Open MAX components - binary files + Open MAX binary for registering components built as + shared objects and loaded at runtime. + . + This package provides a registeration binary for Open MAX components diff -Nru libomxil-bellagio-0.9.3/debian/libomxil-bellagio0.install libomxil-bellagio-0.9.3/debian/libomxil-bellagio0.install --- libomxil-bellagio-0.9.3/debian/libomxil-bellagio0.install 2011-07-19 07:20:49.000000000 +0200 +++ libomxil-bellagio-0.9.3/debian/libomxil-bellagio0.install 2014-02-20 05:11:59.000000000 +0100 @@ -1,4 +1 @@ -usr/bin/omxregister-bellagio -debian/omxregister-bellagio-0 usr/bin/ -usr/lib/libomxil*.so.* -usr/share/man/man1 +usr/lib/lib*.so.* diff -Nru libomxil-bellagio-0.9.3/debian/libomxil-bellagio0.links libomxil-bellagio-0.9.3/debian/libomxil-bellagio0.links --- libomxil-bellagio-0.9.3/debian/libomxil-bellagio0.links 2011-07-19 07:20:49.000000000 +0200 +++ libomxil-bellagio-0.9.3/debian/libomxil-bellagio0.links 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -usr/share/man/man1/omxregister-bellagio.1 usr/share/man/man1/omxregister-bellagio-0.1 diff -Nru libomxil-bellagio-0.9.3/debian/libomxil-bellagio-bin.install libomxil-bellagio-0.9.3/debian/libomxil-bellagio-bin.install --- libomxil-bellagio-0.9.3/debian/libomxil-bellagio-bin.install 1970-01-01 01:00:00.000000000 +0100 +++ libomxil-bellagio-0.9.3/debian/libomxil-bellagio-bin.install 2012-01-17 19:22:25.000000000 +0100 @@ -0,0 +1,2 @@ +usr/bin/* +usr/share/man/man1 diff -Nru libomxil-bellagio-0.9.3/debian/patches/0101_unused_variables.patch libomxil-bellagio-0.9.3/debian/patches/0101_unused_variables.patch --- libomxil-bellagio-0.9.3/debian/patches/0101_unused_variables.patch 1970-01-01 01:00:00.000000000 +0100 +++ libomxil-bellagio-0.9.3/debian/patches/0101_unused_variables.patch 2012-01-17 19:22:25.000000000 +0100 @@ -0,0 +1,126 @@ +Description: Remove unused variables which caused errors with gcc-4.6 -Werror + These assignments wouldn't have helped with -Wunused-result anyway. +Author: Colin Watson +Bug-Ubuntu: https://bugs.launchpad.net/bugs/831282 +Forwarded: no +Last-Update: 2011-09-14 + +--- + src/omxregister.c | 7 +++---- + test/components/audio_effects/omxaudiomixertest.c | 11 +++-------- + test/components/audio_effects/omxvolcontroltest.c | 3 +-- + 3 files changed, 7 insertions(+), 14 deletions(-) + +--- libomxil-bellagio-0.9.3.orig/src/omxregister.c ++++ libomxil-bellagio-0.9.3/src/omxregister.c +@@ -172,7 +172,6 @@ static int buildComponentsList(FILE* omx + int index; + char* currentpath = componentspath; + char* actual; +- int err; + nameList *allNames = NULL; + nameList *currentName = NULL; + nameList *tempName = NULL; +@@ -247,8 +246,8 @@ static int buildComponentsList(FILE* omx + stComponents[i]->multiResourceLevel = NULL; + } + fptr(stComponents); +- err = fwrite(lib_absolute_path, 1, strlen(lib_absolute_path), omxregistryfp); +- err = fwrite("\n", 1, 1, omxregistryfp); ++ fwrite(lib_absolute_path, 1, strlen(lib_absolute_path), omxregistryfp); ++ fwrite("\n", 1, 1, omxregistryfp); + + + for (i = 0; i3) { +@@ -506,7 +503,6 @@ OMX_ERRORTYPE audiomixerEmptyBufferDone( + OMX_PTR pAppData, + OMX_BUFFERHEADERTYPE* pBuffer) { + +- OMX_ERRORTYPE err; + int data_read; + + +@@ -532,7 +528,7 @@ OMX_ERRORTYPE audiomixerEmptyBufferDone( + pBuffer->nFlags = OMX_BUFFERFLAG_EOS; + bEOS[pBuffer->nInputPortIndex]=OMX_TRUE; + DEBUG(DEB_LEV_SIMPLE_SEQ, "In %s Sending EOS for Stream %i\n", __func__, (int)pBuffer->nInputPortIndex); +- err = OMX_EmptyThisBuffer(hComponent, pBuffer); ++ OMX_EmptyThisBuffer(hComponent, pBuffer); + return OMX_ErrorNone; + } + } else { +@@ -541,7 +537,7 @@ OMX_ERRORTYPE audiomixerEmptyBufferDone( + } + if(!bEOS[pBuffer->nInputPortIndex]) { + DEBUG(DEB_LEV_FULL_SEQ, "Empty buffer %p\n", pBuffer); +- err = OMX_EmptyThisBuffer(hComponent, pBuffer); ++ OMX_EmptyThisBuffer(hComponent, pBuffer); + }else { + DEBUG(DEB_LEV_FULL_SEQ, "In %s Dropping Empty This buffer to Audio Mixer\n", __func__); + } +@@ -554,7 +550,6 @@ OMX_ERRORTYPE audiomixerFillBufferDone( + OMX_PTR pAppData, + OMX_BUFFERHEADERTYPE* pBuffer) { + +- OMX_ERRORTYPE err; + int i; + + DEBUG(DEB_LEV_FULL_SEQ, "Hi there, I am in the %s callback. Got buflen %i for buffer at 0x%p\n", +@@ -578,7 +573,7 @@ OMX_ERRORTYPE audiomixerFillBufferDone( + pBuffer->nFilledLen = 0; + /* Reschedule the fill buffer request */ + if(!bEOS[0] || !bEOS[1] || !bEOS[2] || !bEOS[3]) { +- err = OMX_FillThisBuffer(hComponent, pBuffer); ++ OMX_FillThisBuffer(hComponent, pBuffer); + } else { + DEBUG(DEB_LEV_FULL_SEQ, "In %s Dropping Fill This buffer to Audio Mixer\n", __func__); + } diff -Nru libomxil-bellagio-0.9.3/debian/patches/series libomxil-bellagio-0.9.3/debian/patches/series --- libomxil-bellagio-0.9.3/debian/patches/series 2014-02-19 20:35:48.000000000 +0100 +++ libomxil-bellagio-0.9.3/debian/patches/series 2014-03-03 22:21:40.000000000 +0100 @@ -3,5 +3,5 @@ 0003_fix_docdir.patch 0004_fix_FTBFS_for_natty.patch 0005_test_build.patch -0006_fix_FTBFS_for_gcc4.6.patch 0007_remove_online_sourceforge_logo.patch +0101_unused_variables.patch