|
Description
Cena Salvatore
2004-03-21 15:53:24 UTC
Created attachment 27757 [details]
libmpeg3-1.5.4.ebuild
Many old patch isn't need.
Created attachment 27758 [details]
Manifest Update
Manifest Updated
Created attachment 27759 [details, diff]
Patch need
mpeg3split modified
Created attachment 27761 [details, diff]
Gentoo Update.
Need for change PATH of install
Created attachment 27762 [details, diff]
Gentoo Update
Update for change install position
Created attachment 27763 [details, diff]
Update for Large File
Update for Large File
Created attachment 27764 [details]
Digest File
Digest File
My emerge info.... # emerge info Portage 2.0.50-r1 (default-x86-2004.0, gcc-3.3.2, glibc-2.3.2-r9, 2.6.3-gentoo-r1) ================================================================= System uname: 2.6.3-gentoo-r1 i686 Intel(R) Pentium(R) M processor 1500MHz Gentoo Base System version 1.4.3.13 Autoconf: sys-devel/autoconf-2.58-r1 Automake: sys-devel/automake-1.7.7 ACCEPT_KEYWORDS="x86" AUTOCLEAN="yes" CFLAGS="-march=pentium4 -pipe -O3 -fomit-frame-pointer -fforce-addr -frename-registers -fprefetch-loop-arrays -falign-functions=64" CHOST="i686-pc-linux-gnu" COMPILER="gcc3" CONFIG_PROTECT="/etc /usr/X11R6/lib/X11/xkb /usr/kde/2/share/config /usr/kde/3.2/share/config /usr/kde/3/share/config /usr/lib/mozilla/defaults/pref /usr/share/config /var/qmail/control" CONFIG_PROTECT_MASK="/etc/gconf /etc/terminfo /etc/env.d" CXXFLAGS="-march=pentium4 -pipe -O3 -fomit-frame-pointer -fforce-addr -frename-registers -fprefetch-loop-arrays -falign-functions=64" DISTDIR="/usr/portage/distfiles" FEATURES="autoaddcvs ccache sandbox" GENTOO_MIRRORS="ftp://ftp.easynet.nl/mirror/gentoo/" MAKEOPTS="-j2" PKGDIR="/usr/portage/packages" PORTAGE_TMPDIR="/var/tmp" PORTDIR="/usr/portage" PORTDIR_OVERLAY="" SYNC="rsync://rsync.gentoo.org/gentoo-portage" USE="X aalib alsa apm arts avi berkdb cdr crypt cups directfb dvd encode esd foomaticdb gdbm gif gpm gtk gtk2 imlib java jpeg kde libg++ libwww mad mikmod motif mozilla mpeg ncurses nls oggvorbis opengl oss pam pdflib perl png python qt quicktime readline sdl slang spell ssl svga tcpd truetype x86 xml2 xmms xv zlib" Created attachment 28283 [details, diff]
1.5.4-gentoo-p1.patch New Version
Update... sorry previonius version don't install HEADER....
Created attachment 28284 [details]
New digest-libmpeg3-1.5.4
Comment on attachment 27757 [details]
libmpeg3-1.5.4.ebuild
New Ebuild
Created attachment 28285 [details]
New Manifest Updated
Created attachment 51589 [details, diff]
1.5.4-gcc3.4.patch
modified patch from libmpeg-1.5.4 to add gcc-3.4* support for libmpeg-1.5.4
Created attachment 51591 [details]
libmpeg3-1.5.4.ebuild
Updated libmpeg3-1.5.4 ebuild that uses the gcc-3.4 patch if needed
Please submit the ebuild as an unified diff between the portage version and your's so that it's simpler validate it. Also please tell what does your changes do exactly. Thanks for your work. here's an ebuild and updated patches for libmpeg3-1.6. patches 05, 06, and 08
have been dropped since they're no longer applicable, patches 01 and 02 have
been re-done, and the rest still apply.
the current portage ebuild grabs a patch archive from a non-Gentoo site. this
shouldn't be done so i put the patches in files/${PV} in the ebuild, but the
total size of the uncompressed patches is 36kb so the tarball might need to be
placed on the mirrors (or is it 20kb per patch, not total?).
i'll attach a tarball of the overlay and then the broken out patches and ebuild
diff below. i haven't done any testing besides checking that it compiles so
please give it a workout to see if anything pops up. ;D
Created attachment 70828 [details, diff]
libmpeg3-1.6.ebuild
Comment on attachment 70828 [details, diff]
libmpeg3-1.6.ebuild
tarball
Created attachment 70830 [details, diff]
libmpeg3-1.6.ebuild.diff
diff against libmpeg3-1.5.2-r1 in portage.
Created attachment 70831 [details, diff]
01_all_installheader.patch
Created attachment 70832 [details, diff]
02_all_mpeg3split.patch
comment #17 and comment #18 are the same thing, i just attached it twice by accident. ;p any chance of this getting bumped? this bug is nearly two years old. The attached 1.6 tarball isn't actually compressed, it's just a plain tar archive. I just managed to successfully compile this. The only problem was a Portage message about has_pie being deprecated. gimp-gap-2.2.0 really wants 1.5.4 though. Oh well. I'll have to use the bundled version. my bad. updated and obsoleted. I have to join this case ...
the current "stable" media-libs/libmpeg3-1.5.2 does not compile for me while the "~x86" media-libs/libmpeg3-1.5.2-r3 compiles so I would like to see as stable anything newer than 1.5.2("-r0")
the compile error is:
gcc -c `cat i686/c_flags` video/output.c -o i686/video/output.o
video/output.c:210: warning: integer constant is too large for ‘long’ type
video/output.c:212: warning: integer constant is too large for ‘long’ type
video/output.c:214: warning: integer constant is too large for ‘long’ type
video/output.c:301: warning: integer constant is too large for ‘long’ type
video/output.c:303: warning: integer constant is too large for ‘long’ type
video/output.c: In function ‘mpeg3video_ditherframe’:
video/output.c:722: error: invalid lvalue in increment
video/output.c:747: error: invalid lvalue in increment
video/output.c:787: error: invalid lvalue in increment
video/output.c:812: error: invalid lvalue in increment
make: *** [i686/video/output.o] Error 1
!!! ERROR: media-libs/libmpeg3-1.5.2 failed.
Created attachment 91844 [details]
libmpeg3-1.7-patches-1.tar.bz2
Created attachment 91845 [details]
libmpeg3-1.7-patches-1.tar.bz2
Created attachment 91846 [details, diff]
libmpeg3-1.7-gnustack.patch
for ${FILESDIR}
Created attachment 91852 [details, diff]
libmpeg3-1.7.ebuild.diff
here's a diff against 1.5.2-r3 for libmpeg3-1.7 that was just released.
i freshened up the ebuild a bit along the way.
- the patchset now uses ${P} instead of ${PN} so different versions with the same patchlevel don't collide.
- removed the gcc-version checks and 3.4 and 4.x patches as 1.7 builds fine without them.
- removed the a52 patch, again fixed upstream
- removed 05_all_proper-c.patch, 06_all_no-nasm.patch, and 08_all_gcc34.patch from the patchset as they either aren't relevant or fixed in this release.
- reworked 01_all_installheader.patch, 02_all_mpeg3split.patch, 09_all_gcc4.patch, and gentoo-p2.patch so they apply.
- i couldn't do anything with the libmpeg3-1.5.2-textrel-fix.patch. it's way over my head, so i just commented it out with a FIXME for the time being.
(In reply to comment #26) > I have to join this case ... > the current "stable" media-libs/libmpeg3-1.5.2 does not compile for me while > the "~x86" media-libs/libmpeg3-1.5.2-r3 compiles so I would like to see as > stable anything newer than 1.5.2("-r0") I filed bug #140584 for this. Created attachment 96537 [details]
Yet Another Ebuild
Hi,
I'm damned, I should have searched here before trying to bump libmpeg3...
but well I have a now lot of patches, which are mostly merges of the old ones, but there are some additions, lets start with the ebuild :
-SRC_URI="mirror://sourceforge/heroines/${P}-src.tar.bz2
- mirror://gentoo/${PN}-patches-${PATCHLEVEL}.tar.bz2
- mirror://gentoo/${P}-textrel-fix.patch.bz2"
+SRC_URI="mirror://sourceforge/heroines/${P}-src.tar.bz2"
removing old uri's here.
-KEYWORDS="~alpha amd64 arm hppa ia64 mips ppc ppc64 sh sparc x86"
-IUSE="mmx"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
+IUSE="mmx css"
~ keywords, and possibilty to switch off css, we'll see how after.
- [ "`gcc-version`" == "3.4" -o "`gcc-major-version`" -ge 4 ] || \
- EPATCH_EXCLUDE="${EPATCH_EXCLUDE} 08_all_gcc34.patch"
- [ "`gcc-major-version`" -ge 4 ] || \
- EPATCH_EXCLUDE="${EPATCH_EXCLUDE} 09_all_gcc4.patch"
-
- EPATCH_SUFFIX="patch" epatch ${WORKDIR}/${PV}
sed -i -e "/LIBS = /s:$: -L\${ROOT}usr/$(get_libdir) -la52:" Makefile
- epatch "${FILESDIR}/${P}-a52.patch"
+ epatch "${FILESDIR}/${P}-makefile.patch"
+ epatch "${FILESDIR}/${P}-mpeg3split.patch"
+ use mmx && epatch "${FILESDIR}/${P}-textrel.patch"
epatch "${FILESDIR}/${P}-gnustack.patch"
- epatch "${DISTDIR}/${P}-textrel-fix.patch.bz2"
Removing some fixes, adding other ones, I'll give details when I'll post the patches.
+
+ if ! use css; then
+ sed -i 's:USE_CSS = 1:USE_CSS = 0:' Makefile
+ fi
Simply set USE_CSS to 0 to disable css, which is set to 1 by default.
- epatch ${WORKDIR}/${PV}/gentoo-p2.patch
+ epatch ${FILESDIR}/gentoo-p2.patch
Here it is the same as in your tarball, I will not attach it so.
Created attachment 96538 [details, diff]
A small patch to build mpeg3split
It's the same as in the tarball, but I've made a separate patch for the makefile, it was easier to generate a diff.
Created attachment 96540 [details, diff]
The makefile patch
Now the big one : The makefile...
- It includes the "04_all_largefile.patch".
- It does not build A52 but links against the one installed.
- It builds the shared library libmpeg3.so (with pic) and gives it a soname (there was a bug filled against it, I've seen this one but not this old bump request bug...)
- It builds mpeg3split
- It includes the "01_all_installheader.patch"
- It includes the "07_all_gentoo-multilib.patch"
Created attachment 96542 [details, diff]
The textrel possible port
Here is the textrel possible port.
It's the same as before for .S asm files, other files seems to not have asm anymore. It builds fine on my i686 without any complaint about text relocations.
The gnustack patch is the same as before, I'm not attaching it.
Created attachment 96544 [details, diff]
A patch for transcode.
But after that... everything was fine, and I tried to rebuild the packages "equery depends libmpeg3" told me.
And... transcode-1.0.2-r3 did not build, so I had to write a small patch to handle the new headers, here it is.
The other packages I had built fine without patch: DirectFB, cinelerra-cvs and djplay.
Sorry if these posts are a bit messy, I'm starting to be a little bit tired :(
i don't understand why this bug has been open for two and a half years. (In reply to comment #37) > i don't understand why this bug has been open for two and a half years. > I'd also like to see libmpeg3-1.7 in the tree 'cause it is required for new Cinelerra-2.1 (see http://bugs.gentoo.org/show_bug.cgi?id=147597). I built libmpeg3-1.7 on my amd64 using the above ebuild + patches, but it would be nice if someone more knowledgable could polish the whole thing a bit... Sincerely, Gour Are you talking about cinelerra 2.1 from hv or cinelerra cv that you get from cvs.cinelerra.org ? AFAIK, cinelerra cv comes with libmpeg3 that is built-in and statically linked, and the version now in svn is the 1.7. I'll post a tarball containing the above patches and a new build system made with autotools based on the build system from cinelerra cv as soon as I'll get it work perfectly. Regards, Alexis. (In reply to comment #39) > Are you talking about cinelerra 2.1 from hv or cinelerra cv that you get from > cvs.cinelerra.org ? > AFAIK, cinelerra cv comes with libmpeg3 that is built-in and statically linked, > and the version now in svn is the 1.7. > I'll post a tarball containing the above patches and a new build system made > with autotools based on the build system from cinelerra cv as soon as I'll get > it work perfectly. > Regards, > Alexis. Hi Friends... My old patch is insert for old version of Cinelerra found on Cinelerra site. New Tarball is possibile found on http://prdownloads.sourceforge.net/heroines/cinelerra-2.1-src.tar.bz2 but on 2004 there is a problem to compile libmpeg.... i try to compile now. Bye Salvatore Cena Created attachment 98324 [details]
Complete patchset and build system based on cinelerra-cv build system
Here is a complete build system and patchset.
Using autotools and libtool might really easy maintainance of this package, the original build system is somewhat... strange...
The ebuild for this will follow.
Created attachment 98325 [details]
The ebuld for the preceding patchset
Please note that you need to change the mirror location for libmpeg3-1.7-gentoo.tar.bz2 if you plan to add this one.
(In reply to comment #39) > Are you talking about cinelerra 2.1 from hv or cinelerra cv that you get from > cvs.cinelerra.org ? > > AFAIK, cinelerra cv comes with libmpeg3 that is built-in and statically linked, > and the version now in svn is the 1.7. You're right, ie. my mistake - I wasn't aware that libmpeg3 comes in svn and that+s why I had/have strange problems with Cinelerry-2.1 ebuild. > I'll post a tarball containing the above patches and a new build system made > with autotools based on the build system from cinelerra cv as soon as I'll get > it work perfectly. So, it means that libmpeg3 ebuild does not block #147597? Sincerely, Gour
> So, it means that libmpeg3 ebuild does not block #147597?
I don't think it does. If cinelerra-cvs tries to link to this libmpeg3, that's a bug and should not happen.
From what I've seen from the source, libmpeg3 from hv does not support css but the one shipped with cinelerra-cvs does.
I've bumped libmpeg3 1.7, but masked it until I can fix the packages that this bump breaks.
I've also dropped keywords for arches I couldn't test, feel free to test it and file a keyword request if it works.
In CVS, re-keywording handled in Bug 150799. Closing this thing, if you have issue w/ 1.7, file a new bug please. |
