124995 2006-03-04 11:36 0000 media-libs/libdc1394 uses CLK_TCK not CLOCKS_PER_SEC 2006-05-03 07:06:10 0000 1 1 1 Unclassified Gentoo Linux GCC Porting unspecified All Linux RESOLVED FIXED http://forums.gentoo.org/viewtopic-t-402539-postdays-0-postorder-asc-start-650.html P2 normal --- 1 beech@metalshark.co.uk seemant@gentoo.org avuton@gmail.com beech@metalshark.co.uk ben@xnode.org birder@ozemail.com.au master_up@post.cz mcharleb@qualcomm.com mmokrejs@ribosome.natur.cuni.cz sbriesen@gentoo.org vapier@gentoo.org xordan@gmail.com beech@metalshark.co.uk 2006-03-04 11:36:49 0000 Updated the ebuild with the patch in. beech@metalshark.co.uk 2006-03-04 11:37:11 0000 Created an attachment (id=81329) libdc1394-2.0.0_pre5-r2.ebuild beech@metalshark.co.uk 2006-03-04 11:37:32 0000 Created an attachment (id=81330) clk_tck_to_clocks_per_sec_grab_partial_image.c.patch beech@metalshark.co.uk 2006-03-04 12:33:11 0000 You're probably gonna say something like Marcelo Goes did - just to make sure please read http://bugs.gentoo.org/show_bug.cgi?id=124991 post 3 and 4. beech@metalshark.co.uk 2006-03-04 12:51:51 0000 This patch works with versions as old as libdc1394-1.0.0 (just had to regress for ffmpeg). beech@metalshark.co.uk 2006-03-04 12:56:47 0000 Created an attachment (id=81341) libdc1394-1.0.0-r1.ebuild beech@metalshark.co.uk 2006-03-06 10:52:20 0000 The patch needs to detect if CLK_TCK is present if not use CLOCKS_PER_SEC in order to be backwards compatible - this is beyond my c/c++ knowledge - flame passing moment! malc@gentoo.org 2006-03-14 01:04:38 0000 *** Bug 126040 has been marked as a duplicate of this bug. *** scruggsj@sbcglobal.net 2006-03-15 14:14:21 0000 (In reply to comment #6) > The patch needs to detect if CLK_TCK is present if not use CLOCKS_PER_SEC in > order to be backwards compatible - this is beyond my c/c++ knowledge - flame > passing moment! > No. You don't need to detect if CLK_TCK is present in C++, just use the 'has_version' function in the ebuild. I think it would look something like this, so correct me if I am wrong: if has_version ">=sys-libs/glibc-2.4"; then epatch some-patch-name.patch fi I only know a little bit about has_version, but I think that is correct. All I can say is test it. ;) jakub@gentoo.org 2006-03-17 14:22:11 0000 *** Bug 126598 has been marked as a duplicate of this bug. *** d.gaffuri@reply.it 2006-03-18 06:47:52 0000 (In reply to comment #8) > No. You don't need to detect if CLK_TCK is present in C++, just use the > 'has_version' function in the ebuild. I think it would look something like > this, so correct me if I am wrong: > if has_version ">=sys-libs/glibc-2.4"; then > epatch some-patch-name.patch > fi > > I only know a little bit about has_version, but I think that is correct. All I > can say is test it. ;) > I confirm that it works if has_version ">=sys-libs/glibc-2.4"; then epatch ${FILESDIR}/clk_tck_to_clocks_per_sec.patch fi beech@metalshark.co.uk 2006-03-18 09:17:58 0000 if has_version ">=sys-libs/glibc-2.3.9"; then epatch ${FILESDIR}/clk_tck_to_clocks_per_sec.patch fi Would be better. seemant@gentoo.org 2006-03-31 13:00:33 0000 hi all, sorry for the late reply. I had submitted a patch against 2.0.0pre6 upstream about the CLK_TCK issue. I don't like the patch in its current form, as I'd rather have a solution that'll work throughout (and consequently, one we can simply push upstream). vapier, your thoughts? mmokrejs@ribosome.natur.cuni.cz 2006-04-03 12:42:52 0000 The bug is present in libdc1394-1.2.1 as well (cannot compile the example subdirectory. Couldn't that be disabled?). media-video/ffmpeg-0.4.9_p20060302 requires libdc1394-1.0.1 but "emerge -u" tries the version 2.0.0_pre6 series which does not have the problem. So I modified the ffmpegs's ebuild not to require the version libdc1394-1* anymore. So, should 1.2.1 be provided along with the patch or shall we try rather the version 2 series on ~x86? Portage 2.1_pre7-r4 (default-linux/x86/2005.0, gcc-3.4.6, glibc-2.4-r1, 2.6.16-rc5 i686) ================================================================= System uname: 2.6.16-rc5 i686 Mobile Intel(R) Pentium(R) 4 - M CPU 1.80GHz Gentoo Base System version 1.12.0_pre16 dev-lang/python: 2.3.4-r1, 2.4.2-r1 sys-apps/sandbox: 1.2.17 sys-devel/autoconf: 2.13, 2.59-r7 sys-devel/automake: 1.4_p6, 1.5, 1.6.3, 1.7.9-r1, 1.8.5-r3, 1.9.6-r2 sys-devel/binutils: 2.16.1-r2 sys-devel/libtool: 1.5.22 virtual/os-headers: 2.6.11-r3 ACCEPT_KEYWORDS="x86 ~x86" AUTOCLEAN="yes" CBUILD="i686-pc-linux-gnu" CFLAGS="-O2 -march=pentium4 -mmmx -msse -msse2 -fomit-frame-pointer -pipe" CHOST="i686-pc-linux-gnu" CONFIG_PROTECT="/etc /usr/kde/2/share/config /usr/kde/3.4/env /usr/kde/3.4/share/config /usr/kde/3.4/shutdown /usr/kde/3.5/env /usr/kde/3.5/share/config /usr/kde/3.5/shutdown /usr/kde/3/share/config /usr/lib/mozilla/defaults/pref /usr/share/X11/xkb /usr/share/config /usr/spool/PBS /var/bind /var/qmail/alias /var/qmail/control /var/spool/PBS" CONFIG_PROTECT_MASK="/etc/eselect/compiler /etc/gconf /etc/revdep-rebuild /etc/terminfo /etc/texmf/web2c /etc/env.d" CXXFLAGS="-O2 -march=pentium4 -mmmx -msse -msse2 -fomit-frame-pointer -pipe" DISTDIR="/usr/portage/distfiles" FEATURES="autoconfig distlocks metadata-transfer sandbox sfperms strict" GENTOO_MIRRORS="http://distfiles.gentoo.org http://distro.ibiblio.org/pub/linux/distributions/gentoo" PKGDIR="/usr/portage/packages" PORTAGE_TMPDIR="/var/tmp" PORTDIR="/usr/portage" PORTDIR_OVERLAY="/usr/local/portage" SYNC="rsync://rsync.gentoo.org/gentoo-portage" USE="x86 FFmpeg X Xaw3d a52 aac aalib acpi alsa amr apache2 apm arts ati avi berkdb bitmap-fonts bonobo caca cdparanoia cdr cpudetection crypt cscope ctype cups dba dga directfb divx divx5 divx5linux dri dts dv dvb dvd dvdr dvdread eds emacs emacs-w3 emboss encode esd ethereal evo f77 faad faad2 fam fame fbcon ffmpeg flash foomaticdb fortran fvwm fvwm2 gb gd gdbm ggi gif gphoto2 gpm gstreamer gtk gtk2 gtkhtml i8x0 icc iconv ieee1394 ifc imagemagick imlib imlib2 inifile innodb ipv6 isdnlog ithreads java jpeg lcms leim libcaca libg++ libwww lirc live lzo mad matroska mcal mesa mhash mikmod ming mmx mmx2 mmxext motif mozilla mp3 mpeg mule musepack mysql ncurses network nls nptl nptlonly ogg oggvorbis opengl oss pam pcre pda pdflib perl plotutils plugin png ppds pppd pthread pthreads python qt qtx quicktime readline rtc samba scanner scp sdl server session slp spell sse sse2 ssl stroke tcltk tcpd tetex theora thread threads tiff truetype truetype-fonts type1-fonts unicode usb v4l v4l2 vorbis win32 win32codecs winvidix wmf x264 xanim xml xml2 xmms xosd xv xvid xvmc zeo zlib elibc_glibc kernel_linux userland_GNU video_cards_ati" Unset: ASFLAGS, CTARGET, EMERGE_DEFAULT_OPTS, INSTALL_MASK, LANG, LC_ALL, LDFLAGS, LINGUAS, MAKEOPTS jakub@gentoo.org 2006-04-16 02:33:04 0000 *** Bug 130110 has been marked as a duplicate of this bug. *** vapier@gentoo.org 2006-04-17 00:43:16 0000 ok, the fix here is really quite simple: #ifndef CLOCKS_PER_SEC # define CLOCKS_PER_SEC CLK_TCK #endif elapsed_time = (float)(times(&tms_buf) - start_time) / CLOCKS_PER_SEC; CLK_TCK is the obsolete name so everything should be using CLOCKS_PER_SEC nerdboy@gentoo.org 2006-04-23 15:27:12 0000 Created an attachment (id=85310) SpanKY's CLK_TCK patch This is still broken, and ffmpeg won't build against the newer libdc1394 (at least not easily). Since SpanKY's CLK_TCK patch fixes the current stable (which is broken, at least for some) why not just apply it? andrei.ivanov@gmail.com 2006-04-24 01:51:24 0000 The `dsniff` ebuild has something like this in it: if has_version '>=sys-libs/glibc-2.4' ; then append-flags -DCLK_TCK=CLOCKS_PER_SEC fi Maybe it's a better solution. beech@metalshark.co.uk 2006-04-24 03:15:45 0000 I am adding that to my make.conf to avoid such errors in future - as this is now a month and a half on since the original bug thread was posted I expect such fixes not to appear in Gentoo for some time... seemant@gentoo.org 2006-05-03 06:01:44 0000 wow, I'm ashamed of myself for sleeping on the job on this. Beech, you have every reason to be frustrated with me. I can only humbly apologise for my delay. I'll fix the CLK_TCK issue immediately in all the libdc's. What I am stuck on, is that I can not slot libdc1394 without hacking everything that depends on libdc1394-1 or -2 exclusively. I'm open to suggestions on that. As a favour, please e-me if you make a comment (yes, I'm supposed to get bugz mail but it gets lost in the shuffle these days). I honestly didn't even check this report until a user emailed me last night with a nudge. Wrong behaviour on my part, though, I do realise that. Anyway, plan of action: 1. Immediate term, apply the CLK_TCK fix to all libdc1394 ebuilds in the tree 2. Figure out a solution for things which depend on specific major releases of the library Oh yes, the reason thqat I can not slot it is that both libraries install the same headers and libs into the same locations. So, assuming we install into /usr/include/libdc1394-1 and append something to .a .la and .so files to indicate the -1ness, we then have to go back to things which depend on libdc1394-1 and inform them of the new header file locations and library names. If this is what will fix everything then I'm willing to do it, but I'll need y'all's help to figure out what those things are. seemant@gentoo.org 2006-05-03 06:06:40 0000 Beech, are you on IRC at all? If so please come chat with me on freenode (I'm seemant on there). seemant@gentoo.org 2006-05-03 07:06:10 0000 this change is in 1.0.0-r1, 1.2.1 and 2.0.0_pre6-r2. Other versions of the ebuild are gone entirely, for reasons in bug #117201 81329 2006-03-04 11:37 0000 libdc1394-2.0.0_pre5-r2.ebuild libdc1394-2.0.0_pre5-r2.ebuild text/plain IyBDb3B5cmlnaHQgMTk5OS0yMDA2IEdlbnRvbyBGb3VuZGF0aW9uCiMgRGlzdHJpYnV0ZWQgdW5k ZXIgdGhlIHRlcm1zIG9mIHRoZSBHTlUgR2VuZXJhbCBQdWJsaWMgTGljZW5zZSB2MgojICRIZWFk ZXI6IC92YXIvY3Zzcm9vdC9nZW50b28teDg2L21lZGlhLWxpYnMvbGliZGMxMzk0L2xpYmRjMTM5 NC0yLjAuMF9wcmU1LXIyLmVidWlsZCx2IDEuMSAyMDA2LzAzLzA0IDE5OjIyOjAwIE1ldGFsc2hh cmsgRXhwICQKCmluaGVyaXQgZXV0aWxzCgpNWV9QPSR7UC9fLy19ClM9JHtXT1JLRElSfS8ke01Z X1B9CgpERVNDUklQVElPTj0ibGlicmFyeSBmb3IgY29udHJvbGluZyBJRUVFIDEzOTQgY29uZm9y bWluZyBiYXNlZCBjYW1lcmFzIgpIT01FUEFHRT0iaHR0cDovL3NvdXJjZWZvcmdlLm5ldC9wcm9q ZWN0cy9saWJkYzEzOTQvIgpTUkNfVVJJPSJtaXJyb3I6Ly9zb3VyY2Vmb3JnZS8ke1BOfS8ke01Z X1B9LnRhci5neiIKCkxJQ0VOU0U9IkxHUEwtMi4xIgpTTE9UPSIwIgpLRVlXT1JEUz0ifmFscGhh IH5hbWQ2NCB+YXJtIH5ocHBhIH5pYTY0IH5wcGMgfnBwYzY0IH5zcGFyYyB+eDg2IgpJVVNFPSJY IgoKUkRFUEVORD0iPj1zeXMtbGlicy9saWJyYXcxMzk0LTAuOS4wCgkJWD8gKCB8fCAoICggeDEx LWxpYnMvbGliU00geDExLWxpYnMvbGliWHYgKQoJCQkJICB2aXJ0dWFsL3gxMSApICkiCkRFUEVO RD0iJHtSREVQRU5EfQoJCXN5cy1kZXZlbC9saWJ0b29sIgoKc3JjX3VucGFjaygpIHsKCXVucGFj ayAke0F9CgljZCAiJHtTfSIKCgkjIEZpeCBhIGJ1ZyB3aGVyZSBpc29fY2hhbm5lbCBwcm9wZXJ0 eSBpcyBub3Qga2VwdCB1cC10by1kYXRlCgllcGF0Y2ggJHtGSUxFU0RJUn0vJHtQfS11cGRhdGUt aXNvX2NoYW5uZWwucGF0Y2gKCgllcGF0Y2ggJHtGSUxFU0RJUn0vY2xrX3Rja190b19jbG9ja3Nf cGVyX3NlY19ncmFiX3BhcnRpYWxfaW1hZ2UuYy5wYXRjaAoKCWlmICEgdXNlIFg7IHRoZW4KCQll cGF0Y2ggJHtGSUxFU0RJUn0vbm94MTEtMi5wYXRjaAoJZmkKCn0KCnNyY19pbnN0YWxsKCkgewoJ bWFrZSBERVNURElSPSIke0R9IiBpbnN0YWxsIHx8IGRpZQoJZG9kb2MgTkVXUyBSRUFETUUgQVVU SE9SUyBDaGFuZ2VMb2cKfQo= 81330 2006-03-04 11:37 0000 clk_tck_to_clocks_per_sec_grab_partial_image.c.patch clk_tck_to_clocks_per_sec_grab_partial_image.c.patch text/plain ZGlmZiAtTnVycCBleGFtcGxlcy9ncmFiX3BhcnRpYWxfaW1hZ2UuYyBleGFtcGxlcy9ncmFiX3Bh cnRpYWxfaW1hZ2UuYwotLS0gZXhhbXBsZXMvZ3JhYl9wYXJ0aWFsX2ltYWdlLmMJMjAwNS0wOS0w OSAwODoxNDozNS4wMDAwMDAwMDAgKzAwMDAKKysrIGV4YW1wbGVzL2dyYWJfcGFydGlhbF9pbWFn ZS5jCTIwMDYtMDMtMDQgMTk6MjY6MjYuOTI1MDIyMDAwICswMDAwCkBAIC0yMzYsNyArMjM2LDcg QEAgaW50IG1haW4oaW50IGFyZ2MsIGNoYXIgKmFyZ3ZbXSkgCiAgICAgLyotLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0K ICAgICAgKiAgb3V0cHV0IGVsYXBzZWQgdGltZQogICAgICAqLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tKi8KLSAgICBl bGFwc2VkX3RpbWUgPSAoZmxvYXQpKHRpbWVzKCZ0bXNfYnVmKSAtIHN0YXJ0X3RpbWUpIC8gQ0xL X1RDSzsKKyAgICBlbGFwc2VkX3RpbWUgPSAoZmxvYXQpKHRpbWVzKCZ0bXNfYnVmKSAtIHN0YXJ0 X3RpbWUpIC8gQ0xPQ0tTX1BFUl9TRUM7CiAgICAgcHJpbnRmKCAiZ290IGZyYW1lICVkLiBlbGFw c2VkIHRpbWU6ICVnIHNlYyA9PT4gJWcgZnJhbWVzL3NlY29uZFxuIiwKICAgICAgICAgICAgIGks IGVsYXBzZWRfdGltZSwgKGZsb2F0KWkgLyBlbGFwc2VkX3RpbWUpOwogICB9Cg== 81341 2006-03-04 12:56 0000 libdc1394-1.0.0-r1.ebuild libdc1394-1.0.0-r1.ebuild text/plain IyBDb3B5cmlnaHQgMTk5OS0yMDA2IEdlbnRvbyBGb3VuZGF0aW9uCiMgRGlzdHJpYnV0ZWQgdW5k ZXIgdGhlIHRlcm1zIG9mIHRoZSBHTlUgR2VuZXJhbCBQdWJsaWMgTGljZW5zZSB2MgojICRIZWFk ZXI6IC92YXIvY3Zzcm9vdC9nZW50b28teDg2L21lZGlhLWxpYnMvbGliZGMxMzk0L2xpYmRjMTM5 NC0xLjAuMC1yMS5lYnVpbGQsdiAxLjYgMjAwNi8wMy8wNCAxOTowMzowMCBNZXRhbHNoYXJrIEV4 cCAkCgppbmhlcml0IGV1dGlscwoKREVTQ1JJUFRJT049ImxpYmRjMTM5NCBpcyBhIGxpYnJhcnkg dGhhdCBpcyBpbnRlbmRlZCB0byBwcm92aWRlIGEgaGlnaCBsZXZlbCBwcm9ncmFtbWluZyBpbnRl cmZhY2UgZm9yIGFwcGxpY2F0aW9uIGRldmVsb3BlcnMgd2hvIHdpc2ggdG8gY29udHJvbCBJRUVF IDEzOTQgYmFzZWQgY2FtZXJhcyB0aGF0IGNvbmZvcm0gdG8gdGhlIDEzOTQtYmFzZWQgRGlnaXRh bCBDYW1lcmEgU3BlY2lmaWNhdGlvbiAoZm91bmQgYXQgaHR0cDovL3d3dy4xMzk0dGEub3JnLyki CkhPTUVQQUdFPSJodHRwOi8vc291cmNlZm9yZ2UubmV0L3Byb2plY3RzL2xpYmRjMTM5NC8iCgpT UkNfVVJJPSJtaXJyb3I6Ly9zb3VyY2Vmb3JnZS8ke1BOfS8ke1B9LnRhci5neiIKTElDRU5TRT0i TEdQTC0yLjEiClNMT1Q9IjAiCktFWVdPUkRTPSJhbHBoYSBhbWQ2NCBhcm0gaHBwYSBpYTY0IHBw YyBwcGM2NCBzcGFyYyB4ODYiCklVU0U9IlgiCgpSREVQRU5EPSI+PXN5cy1saWJzL2xpYnJhdzEz OTQtMC45LjAKCQlYPyAoIHx8ICggKCB4MTEtbGlicy9saWJTTSB4MTEtbGlicy9saWJYdiApCgkJ CQkgIHZpcnR1YWwveDExICkgKSIKREVQRU5EPSIke1JERVBFTkR9CgkJc3lzLWRldmVsL2xpYnRv b2wiCgpzcmNfdW5wYWNrKCkgewoJdW5wYWNrICR7QX07IGNkICR7U30KCgllcGF0Y2ggJHtGSUxF U0RJUn0vY2xrX3Rja190b19jbG9ja3NfcGVyX3NlY19ncmFiX3BhcnRpYWxfaW1hZ2UuYy5wYXRj aAoKCWlmICEgdXNlIFg7IHRoZW4KCQllcGF0Y2ggJHtGSUxFU0RJUn0vbm94MTEucGF0Y2gKCWZp Cn0KCnNyY19pbnN0YWxsKCkgewoJZWluc3RhbGwgfHwgZGllCglkb2RvYyBORVdTIFJFQURNRSBB VVRIT1JTCn0K 85310 2006-04-23 15:27 0000 SpanKY's CLK_TCK patch clk_tck.patch text/plain LS0tIGV4YW1wbGVzL2dyYWJfcGFydGlhbF9pbWFnZS5jLm9yaWcJMjAwNi0wNC0yMyAxMzoyNzoy Ny4wMDAwMDAwMDAgLTA3MDAKKysrIGV4YW1wbGVzL2dyYWJfcGFydGlhbF9pbWFnZS5jCTIwMDYt MDQtMjMgMTM6MzE6MDUuMDAwMDAwMDAwIC0wNzAwCkBAIC0yMTYsNyArMjEzLDEwIEBACiAgICAg LyotLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0KICAgICAgKiAgb3V0cHV0IGVsYXBzZWQgdGltZQogICAgICAqLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tKi8KLSAgICBlbGFwc2VkX3RpbWUgPSAoZmxvYXQpKHRpbWVzKCZ0bXNfYnVmKSAtIHN0 YXJ0X3RpbWUpIC8gQ0xLX1RDSzsKKyAgICAjaWZuZGVmIENMT0NLU19QRVJfU0VDCisgICAgIyBk ZWZpbmUgQ0xPQ0tTX1BFUl9TRUMgQ0xLX1RDSworICAgICNlbmRpZgorICAgIGVsYXBzZWRfdGlt ZSA9IChmbG9hdCkodGltZXMoJnRtc19idWYpIC0gc3RhcnRfdGltZSkgLyBDTE9DS1NfUEVSX1NF QzsKICAgICBwcmludGYoICJnb3QgZnJhbWUgJWQuIGVsYXBzZWQgdGltZTogJWcgc2VjID09PiAl ZyBmcmFtZXMvc2Vjb25kXG4iLAogICAgICAgICAgICAgaSwgZWxhcHNlZF90aW1lLCAoZmxvYXQp aSAvIGVsYXBzZWRfdGltZSk7CiAgIH0K