Patchwork [v2] mplayer_git: fix linker error

login
register
mail settings
Submitter Artox
Date Aug. 2, 2011, 7:05 p.m.
Message ID <1312311949-3788-1-git-send-email-josua.mayer97@googlemail.com>
Download mbox | patch
Permalink /patch/9079/
State New, archived
Headers show

Comments

Artox - Aug. 2, 2011, 7:05 p.m.
* fix undefined references  in loader/module.o:
  module.c:(.text+0xd60): undefined reference to `report_entry'
  module.c:(.text+0xd6a): undefined reference to `report_ret'
  module.c:(.text+0xd74): undefined reference to `wrapper_target'
  module.c:(.text+0xd7a): undefined reference to `wrapper'
  and more of these
* Apply already existing patch fix-emu_qtx_api.diff
  This patch was already used in mplayer_svn but is needed
  for the git version too.

Signed-off-by: Josua Mayer <josua.mayer97@googlemail.com>
---
 recipes/mplayer/mplayer_git.bb |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
Paul Menzel - Aug. 3, 2011, 11:15 a.m.
Dear Josua,


thank you for sending a patch iteration with my comments addressed. Just
a side note, you can use `git commit --amend` to edit the commit message
of the last commit. I do not know if you used that since the date looks
different from your initial patch.

Am Dienstag, den 02.08.2011, 21:05 +0200 schrieb Josua Mayer:
> * fix undefined references  in loader/module.o:
>   module.c:(.text+0xd60): undefined reference to `report_entry'
>   module.c:(.text+0xd6a): undefined reference to `report_ret'
>   module.c:(.text+0xd74): undefined reference to `wrapper_target'
>   module.c:(.text+0xd7a): undefined reference to `wrapper'
>   and more of these
> * Apply already existing patch fix-emu_qtx_api.diff
>   This patch was already used in mplayer_svn but is needed
>   for the git version too.
> 
> Signed-off-by: Josua Mayer <josua.mayer97@googlemail.com>
> ---
>  recipes/mplayer/mplayer_git.bb |    3 ++-
>  1 files changed, 2 insertions(+), 1 deletions(-)
> 
> diff --git a/recipes/mplayer/mplayer_git.bb b/recipes/mplayer/mplayer_git.bb
> index 259ce99..995884b 100644
> --- a/recipes/mplayer/mplayer_git.bb
> +++ b/recipes/mplayer/mplayer_git.bb
> @@ -8,7 +8,8 @@ DEPENDS = "libvpx live555 libdvdread libtheora virtual/libsdl ffmpeg xsp zlib li
>  RDEPENDS_${PN} = "mplayer-common"
>  LICENSE = "GPL"
>  SRC_URI = "git://repo.or.cz/mplayer/glamo.git;protocol=git;branch=mplayer2 \
> -   "
> +           file://fix-emu_qtx_api.diff \
> +          "
>  
>  SRC_URI_append_armv7a = " \
>  	   file://0001-video-out-for-omapfb-support.patch \

Long story short I should have looked right away at the commit log for
the patch file [1]. Reading that it would have been clear that this is
needed for x86 targets which the ION seems to be. I thought SHR is
primarily used for ARM mobile devices [2].

Therefore I always want to have the build configuration output from
BitBake pasted in messages and commit messages.

It would be great if you could bring that patch upstream somehow.

I committed your patch with an improved commit message and a `PR` bump
(I hope done correctly) in 1a91fc4b [3].

Unfortunately I could not test this because using `DISTRO = "shr"` and
`MACHINE = "ion"` fails with the following error message.

        Error, Your PACKAGE_ARCHS field contains duplicates. Perhaps you set PACKAGE_EXTRA_ARCHS twice accidently through some tune file?

So please remember to be as elaborate as possible and to provide all
files for others to reproduce your problem. I know looking at the
archive and commit log not everyone follows this rule but it would have
saved me quite some time.


Thanks,

Paul


[1] http://cgit.openembedded.org/cgit.cgi/openembedded/commit/?id=ff57f14c99a6ff61ffb7f1c533523e3e934f96e5
[2] http://shr-project.org/trac
[3] http://cgit.openembedded.org/cgit.cgi/openembedded/commit/?id=1a91fc4b705b0c4f45eb088a2f7aea01ebc9c98e
Artox - Aug. 3, 2011, 12:38 p.m.
Am 03.08.2011 13:15, schrieb Paul Menzel:
> Dear Josua,
>
>
> thank you for sending a patch iteration with my comments addressed. Just
> a side note, you can use `git commit --amend` to edit the commit message
> of the last commit. I do not know if you used that since the date looks
> different from your initial patch.
>
> Am Dienstag, den 02.08.2011, 21:05 +0200 schrieb Josua Mayer:
>> * fix undefined references  in loader/module.o:
>>   module.c:(.text+0xd60): undefined reference to `report_entry'
>>   module.c:(.text+0xd6a): undefined reference to `report_ret'
>>   module.c:(.text+0xd74): undefined reference to `wrapper_target'
>>   module.c:(.text+0xd7a): undefined reference to `wrapper'
>>   and more of these
>> * Apply already existing patch fix-emu_qtx_api.diff
>>   This patch was already used in mplayer_svn but is needed
>>   for the git version too.
>>
>> Signed-off-by: Josua Mayer <josua.mayer97@googlemail.com>
>> ---
>>  recipes/mplayer/mplayer_git.bb |    3 ++-
>>  1 files changed, 2 insertions(+), 1 deletions(-)
>>
>> diff --git a/recipes/mplayer/mplayer_git.bb b/recipes/mplayer/mplayer_git.bb
>> index 259ce99..995884b 100644
>> --- a/recipes/mplayer/mplayer_git.bb
>> +++ b/recipes/mplayer/mplayer_git.bb
>> @@ -8,7 +8,8 @@ DEPENDS = "libvpx live555 libdvdread libtheora virtual/libsdl ffmpeg xsp zlib li
>>  RDEPENDS_${PN} = "mplayer-common"
>>  LICENSE = "GPL"
>>  SRC_URI = "git://repo.or.cz/mplayer/glamo.git;protocol=git;branch=mplayer2 \
>> -   "
>> +           file://fix-emu_qtx_api.diff \
>> +          "
>>  
>>  SRC_URI_append_armv7a = " \
>>  	   file://0001-video-out-for-omapfb-support.patch \
> Long story short I should have looked right away at the commit log for
> the patch file [1]. Reading that it would have been clear that this is
> needed for x86 targets which the ION seems to be. I thought SHR is
> primarily used for ARM mobile devices [2].
>
> Therefore I always want to have the build configuration output from
> BitBake pasted in messages and commit messages.
>
> It would be great if you could bring that patch upstream somehow.
>
> I committed your patch with an improved commit message and a `PR` bump
> (I hope done correctly) in 1a91fc4b [3].
>
> Unfortunately I could not test this because using `DISTRO = "shr"` and
> `MACHINE = "ion"` fails with the following error message.
>
>         Error, Your PACKAGE_ARCHS field contains duplicates. Perhaps you set PACKAGE_EXTRA_ARCHS twice accidently through some tune file?
>
> So please remember to be as elaborate as possible and to provide all
> files for others to reproduce your problem. I know looking at the
> archive and commit log not everyone follows this rule but it would have
> saved me quite some time.
>
>
> Thanks,
>
> Paul
>
>
> [1] http://cgit.openembedded.org/cgit.cgi/openembedded/commit/?id=ff57f14c99a6ff61ffb7f1c533523e3e934f96e5
> [2] http://shr-project.org/trac
> [3] http://cgit.openembedded.org/cgit.cgi/openembedded/commit/?id=1a91fc4b705b0c4f45eb088a2f7aea01ebc9c98e
>
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
In fact I did not use amend but reverted the commit and made a new one.
I wasn't sure if a PR bump was needed as the patch does not change
mplayer in a way that would require people to update it, it only matters
to platforms where it didnt compile before so it wasnt available anyway.
The bitbake error comes from tune-atom.inc:
PACKAGE_EXTRA_ARCHS += "x86 i386 i486 i586 i686"
I removed the i696 there and it would work. I cant send a patch for this
as I do not know whats the correct way to fix this problem.
Paul Menzel - Aug. 3, 2011, 12:58 p.m.
Am Mittwoch, den 03.08.2011, 14:38 +0200 schrieb Josua Mayer:

[…]

> I wasn't sure if a PR bump was needed as the patch does not change
> mplayer in a way that would require people to update it, it only matters
> to platforms where it didnt compile before so it wasnt available anyway.

True. I just did it because Eric had done it in ff57f14c [1].

> The bitbake error comes from tune-atom.inc:
> PACKAGE_EXTRA_ARCHS += "x86 i386 i486 i586 i686"
> I removed the i696 there and it would work. I cant send a patch for this
> as I do not know whats the correct way to fix this problem.

I do not know that either. Maybe it is fixed in oe-core or meta-oe
somewhere because they build for x86 more often.


Thanks,

Paul

Patch

diff --git a/recipes/mplayer/mplayer_git.bb b/recipes/mplayer/mplayer_git.bb
index 259ce99..995884b 100644
--- a/recipes/mplayer/mplayer_git.bb
+++ b/recipes/mplayer/mplayer_git.bb
@@ -8,7 +8,8 @@  DEPENDS = "libvpx live555 libdvdread libtheora virtual/libsdl ffmpeg xsp zlib li
 RDEPENDS_${PN} = "mplayer-common"
 LICENSE = "GPL"
 SRC_URI = "git://repo.or.cz/mplayer/glamo.git;protocol=git;branch=mplayer2 \
-   "
+           file://fix-emu_qtx_api.diff \
+          "
 
 SRC_URI_append_armv7a = " \
 	   file://0001-video-out-for-omapfb-support.patch \