Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 351219 - media-libs/x264 : please review prefix changes / restore accidentally dropped code
Summary: media-libs/x264 : please review prefix changes / restore accidentally dropped...
Status: RESOLVED FIXED
Alias: None
Product: Gentoo/Alt
Classification: Unclassified
Component: Prefix Support (show other bugs)
Hardware: AMD64 Linux
: High enhancement (vote)
Assignee: Gentoo Media-video project
URL:
Whiteboard:
Keywords: Inclusion, PATCH
Depends on:
Blocks: prefix-gx86
  Show dependency tree
 
Reported: 2011-01-09 16:22 UTC by Robert Blenkinsopp (XenoPhoenix)
Modified: 2013-08-01 16:59 UTC (History)
3 users (show)

See Also:
Package list:
Runtime testing required: ---


Attachments
patch for x264-0.0.20120707.ebuild (x264-0.0.20120707.ebuild.patch,1.33 KB, patch)
2012-08-26 03:56 UTC, Christoph Junghans (RETIRED)
Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Robert Blenkinsopp (XenoPhoenix) 2011-01-09 16:22:22 UTC
Ports correctly using ecopy alone on keyword ~amd64-linux

Reproducible: Always




Portage 2.2.01.17583-prefix (prefix/linux/amd64, gcc-4.5.2, unavailable, 2.6.18-128.7.1.el5.centos.plus x86_64)
=================================================================
System uname: Linux-2.6.18-128.7.1.el5.centos.plus-x86_64-Intel-R-_Xeon-R-_CPU_X5460_@_3.16GHz-with-redhat-5.3-Final
Timestamp of tree: Sun, 09 Jan 2011 15:42:18 +0000
app-shells/bash:     4.1_p7
dev-lang/python:     2.6.5-r2, 2.7.1-r00.1
dev-util/cmake:      2.8.1-r2
sys-devel/autoconf:  2.13, 2.68
sys-devel/automake:  1.11.1
sys-devel/binutils:  2.20.51.0.11
sys-devel/gcc:       4.2.4-r01.2, 4.4.5, 4.5.2
sys-devel/gcc-config: 1.4.1-r00.2
sys-devel/libtool:   2.4
sys-devel/make:      3.82
virtual/os-headers:  2.6.36.1 (sys-kernel/linux-headers)
Repositories: gentoo_prefix rb6708_overlay
ACCEPT_KEYWORDS="~amd64-linux"
ACCEPT_LICENSE="*"
CBUILD="x86_64-pc-linux-gnu"
CFLAGS="-fgnu89-inline -march=nocona -O2 -pipe -ggdb"
CHOST="x86_64-pc-linux-gnu"
CONFIG_PROTECT="/etc"
CONFIG_PROTECT_MASK="/etc/ca-certificates.conf /etc/env.d /etc/fonts/fonts.conf /etc/gconf /etc/portage /etc/revdep-rebuild /etc/terminfo"
CXXFLAGS="-march=nocona -O2 -pipe -ggdb"
DISTDIR="/home/user-pool/users/rb6708/prefix/usr/portage/distfiles"
FEATURES="assume-digests binpkg-logs collision-protect distlocks fixlafiles fixpackages news parallel-fetch preserve-libs protect-owned sfperms splitdebug strict unknown-features-warn unmerge-logs unmerge-orphans userfetch"
GENTOO_MIRRORS="http://distfiles.gentoo.org"
LANG="en_US.UTF-8"
LDFLAGS="-Wl,-O1"
LINGUAS="en_GB en_US en"
MAKEOPTS="-j9"
PKGDIR="/home/user-pool/users/rb6708/prefix/usr/portage/packages"
PORTAGE_CONFIGROOT="/home/user-pool/users/rb6708/prefix/"
PORTAGE_RSYNC_OPTS="--recursive --links --safe-links --perms --times --compress --force --whole-file --delete --stats --timeout=180 --exclude=/distfiles --exclude=/local --exclude=/packages"
PORTAGE_TMPDIR="/home/user-pool/users/rb6708/prefix/var/tmp"
PORTDIR="/home/user-pool/users/rb6708/prefix/usr/portage"
PORTDIR_OVERLAY="/home/user-pool/users/rb6708/prefix/usr/local/portage"
SYNC="rsync://rsync.prefix.freens.org/gentoo-portage-prefix"
USE="X alsa amd64 bash-completion bazaar berkdb bugzilla bzip2 cairo cli cracklib crypt cscope curl cxx dbus dri extra fontconfig gdbm gif git gmp gnutls gpg graphite iconv icu ipv6 ithreads jpeg kpathsea mercurial mmx modules mp3 mpi mudflap ncurses network nls nptl nptlonly openmp optimization pcre perl png pppd prefix python readline rtmp secure-delete session socks5 sqlite sse sse2 ssl strong-optimization subversion sysfs system-sqlite tcpd threads tiff tools truetype unicode utils vim-pager vim-syntax vorbis vpx x264 xorg xvid zlib" ALSA_CARDS="ali5451 als4000 atiixp atiixp-modem bt87x ca0106 cmipci emu10k1x ens1370 ens1371 es1938 es1968 fm801 hda-intel intel8x0 intel8x0m maestro3 trident usb-audio via82xx via82xx-modem ymfpci" ALSA_PCM_PLUGINS="adpcm alaw asym copy dmix dshare dsnoop empty extplug file hooks iec958 ioplug ladspa lfloat linear meter mmap_emul mulaw multi null plug rate route share shm softvol" APACHE2_MODULES="actions alias auth_basic authn_alias authn_anon authn_dbm authn_default authn_file authz_dbm authz_default authz_groupfile authz_host authz_owner authz_user autoindex cache cgi cgid dav dav_fs dav_lock deflate dir disk_cache env expires ext_filter file_cache filter headers include info log_config logio mem_cache mime mime_magic negotiation rewrite setenvif speling status unique_id userdir usertrack vhost_alias" COLLECTD_PLUGINS="df interface irq load memory rrdtool swap syslog" ELIBC="glibc" GPSD_PROTOCOLS="ashtech aivdm earthmate evermore fv18 garmin garmintxt gpsclock itrax mtk3301 nmea ntrip navcom oceanserver oldstyle oncore rtcm104v2 rtcm104v3 sirf superstar2 timing tsip tripmate tnt ubx" KERNEL="linux" LCD_DEVICES="bayrad cfontz cfontz633 glk hd44780 lb216 lcdm001 mtxorb ncurses text" LINGUAS="en_GB en_US en" PHP_TARGETS="php5-3" RUBY_TARGETS="ruby18" USERLAND="GNU" XTABLES_ADDONS="quota2 psd pknock lscan length2 ipv4options ipset ipp2p iface geoip fuzzy condition tee tarpit sysrq steal rawnat logmark ipmark dhcpmac delude chaos account"
Unset:  CPPFLAGS, CTARGET, EMERGE_DEFAULT_OPTS, FFLAGS, INSTALL_MASK, LC_ALL, PORTAGE_BUNZIP2_COMMAND, PORTAGE_COMPRESS, PORTAGE_COMPRESS_FLAGS, PORTAGE_RSYNC_EXTRA_OPTS
Comment 1 Benda Xu gentoo-dev 2012-04-13 12:58:44 UTC
Ping. the lastest version (0.0.20100605) of x264 in prefix tree has patches for solaris and OSX. Could somebody with these OSes test and forward port the patch to version 0.0.20120327 (BTW, that version is already keyworded ~x86-linux in gx86 :O )?
Comment 2 Christoph Junghans (RETIRED) gentoo-dev 2012-08-24 13:25:12 UTC
(In reply to comment #1)
> Ping. the lastest version (0.0.20100605) of x264 in prefix tree has patches
> for solaris and OSX. Could somebody with these OSes test and forward port
> the patch to version 0.0.20120327 (BTW, that version is already keyworded
> ~x86-linux in gx86 :O )?

x264-0.0.20120707 in gx86 has prefix keywords.
Comment 3 Jeremy Olexa (darkside) (RETIRED) archtester gentoo-dev Security 2012-08-24 13:36:17 UTC
(In reply to comment #2)
> (In reply to comment #1)
> > Ping. the lastest version (0.0.20100605) of x264 in prefix tree has patches
> > for solaris and OSX. Could somebody with these OSes test and forward port
> > the patch to version 0.0.20120327 (BTW, that version is already keyworded
> > ~x86-linux in gx86 :O )?
> 
> x264-0.0.20120707 in gx86 has prefix keywords.

So? We see it all the time, that the Gentoo Linux maintainers are "too helpful" - the diff is large, something needs fixing...
Comment 4 Christoph Junghans (RETIRED) gentoo-dev 2012-08-26 03:56:38 UTC
Created attachment 322216 [details, diff]
patch for x264-0.0.20120707.ebuild

Differences between prefix-overlay and gx86 are mainly minor.
Comment 5 Christoph Junghans (RETIRED) gentoo-dev 2012-10-04 15:52:00 UTC
Prefix support was added by lu_zero at Sept. 1.

Keywords added by me.
Comment 6 Nikoli 2013-06-18 13:12:16 UTC
Christoph, actually keywords were removed by you in this commit:
http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/media-libs/x264/x264-0.0.20120707.ebuild?r1=1.3&r2=1.4

Commit message tells "added prefix keywords (bug #351219)", but diff has only '~x86-freebsd ~sparc-solaris ~x86-solaris' keywords and several yasm deps removed, nothing was added. Solaris related workarounds are still in x264-0.0.20120327.ebuild, but now it has no solaris related keywords.
So what and why you tried to do in this commit?

Now i am updating x264 packages in multimedia overlay, i need to know what to do with solaris.

Also what about returning this changes to build system upstream? Having a lot workarounds in src_prepare and checking them during every version bump is not fun.
Comment 7 Samuli Suominen (RETIRED) gentoo-dev 2013-06-18 13:19:44 UTC
(In reply to Christoph Junghans from comment #5)
> Prefix support was added by lu_zero at Sept. 1.
> 
> Keywords added by me.

(In reply to Nikoli from comment #6)
> Christoph, actually keywords were removed by you in this commit:
> http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/media-libs/x264/x264-
> 0.0.20120707.ebuild?r1=1.3&r2=1.4
> 
> Commit message tells "added prefix keywords (bug #351219)", but diff has
> only '~x86-freebsd ~sparc-solaris ~x86-solaris' keywords and several yasm
> deps removed, nothing was added. Solaris related workarounds are still in
> x264-0.0.20120327.ebuild, but now it has no solaris related keywords.
> So what and why you tried to do in this commit?
> 
> Now i am updating x264 packages in multimedia overlay, i need to know what
> to do with solaris.
> 
> Also what about returning this changes to build system upstream? Having a
> lot workarounds in src_prepare and checking them during every version bump
> is not fun.


Christoph, PING!
Comment 8 Nikoli 2013-06-18 13:29:42 UTC
About macos workaround, for current git master 'sed -i -e "s|-arch x86_64||g" configure' does this:
         if [ "$SYS" = MACOSX ]; then
             ASFLAGS="$ASFLAGS -f macho64 -m amd64 -DPIC -DPREFIX"
-            if cc_check '' "-arch x86_64"; then
-                CFLAGS="$CFLAGS -arch x86_64"
-                LDFLAGS="$LDFLAGS -arch x86_64"
+            if cc_check '' ""; then
+                CFLAGS="$CFLAGS "
+                LDFLAGS="$LDFLAGS "
             fi

I think it is not safe and also does pointless things, patch should be used instead for removing 'if cc_check '' "-arch x86_64"; then'. Also what upstream tells about it?
Comment 9 Alexis Ballier gentoo-dev 2013-08-01 16:59:08 UTC
+  01 Aug 2013; Alexis Ballier <aballier@gentoo.org> x264-9999.ebuild,
+  +files/x264-cflags.patch:
+  Do not mess too much with CFLAGS. Should fix bug #413661 and bug #351219.
+


please test and reopen if it still fails