View previous topic :: View next topic |
Author |
Message |
Delvin Guru
Joined: 07 Jul 2004 Posts: 546
|
Posted: Tue Mar 15, 2005 6:27 pm Post subject: Wine x11drv and patch problem |
|
|
i tryed to emerge wine 20050310 but x11drv causes troubles so i searched on the forum an found this : https://forums.gentoo.org/viewtopic-t-308113-highlight-wine+amd64.html
when i apply the patch it doesn't work correctly i think
Code: | patch -p1 wine-20050310.ebuild < wine-20050310-amd64.diff missing header for unified diff at line 3 of patch
patching file wine-20050310.ebuild
Hunk #1 FAILED at 27.
Hunk #2 FAILED at 86.
Hunk #3 FAILED at 108.
3 out of 3 hunks FAILED -- saving rejects to file wine-20050310.ebuild.rej
|
then i try to make the digest and here to something happens : Code: | ebuild wine-20050310.ebuild digest
!!! aux_get(): ebuild path for 'local/wine-20050310' not specified:
!!! None
!!! aux_get(): ebuild path for 'local/wine-20050310' not specified:
!!! None
doebuild(): aux_get() error reading local/wine-20050310; aborting. |
i did all in directory /usr/local/portage, i don't know if i'm in the right place _________________ Ne tirez pas sur les canards !! |
|
Back to top |
|
|
Shapemaker n00b
Joined: 22 Aug 2004 Posts: 64 Location: Finland
|
Posted: Tue Mar 15, 2005 7:27 pm Post subject: |
|
|
Ok, here's the deal.
1) When making the portage overlay directory, replicate the directory structure as is. Also, make sure the overlay dir is defined in make.conf
2) Copy over also the files in "/overlay-dir/<package-name>/files" which are needed. In this case:
Code: | # pwd
/pub/gentoo/portage-overlay/app-emulation/wine
# ls -la files/
total 22K
drwxr-xr-x 2 root root 304 Mar 14 03:08 ./
drwxr-xr-x 3 root root 304 Mar 15 21:04 ../
-rw-r--r-- 1 root root 257 Dec 2 16:44 20041019-no-stack.patch
-rw-r--r-- 1 root root 719 Feb 20 04:30 20050211-docs.patch
-rw-rw-r-- 1 root portage 67 Mar 7 18:49 digest-wine-20050211
-rw-rw-r-- 1 root portage 67 Mar 14 03:08 digest-wine-20050310
-rw-r--r-- 1 root portage 325 Dec 1 2003 winearts-kdecvs-fix.patch |
3) Copy over the diff to the "/<overlay-directory>/app-emulation/wine" directory and cd to the same dir.
4) Code: | # patch wine-20050310.ebuild < wine-20050310-amd64.diff |
5) Code: | # ebuild wine-20050310.ebuild digest
>>> Generating digest file...
<<< Wine-20050310.tar.gz
>>> Generating manifest file...
<<< wine-20050211.ebuild
<<< wine-20050310-amd64.diff
<<< wine-20050310.ebuild
<<< wine-20050211-amd64.diff
<<< files/winearts-kdecvs-fix.patch
<<< files/20041019-no-stack.patch
<<< files/digest-wine-20050211
<<< files/digest-wine-20050310
<<< files/20050211-docs.patch
>>> Computed message digests. |
That's it. Enjoy! _________________ "Intellectual Property" should be an affront to anyone capable of independent thought. |
|
Back to top |
|
|
Delvin Guru
Joined: 07 Jul 2004 Posts: 546
|
Posted: Tue Mar 15, 2005 10:40 pm Post subject: |
|
|
Sorry i must have made a mistake somewhere because it still doesn't work what i've done :
Code: | more /etc/make.conf
# These settings were set by the catalyst build script that automatically built
this stage
# Please consult /etc/make.conf.example for a more detailed example
CFLAGS="-pipe -O2 -march=athlon64"
CHOST="x86_64-pc-linux-gnu"
CXXFLAGS="${CFLAGS}"
MAKEOPTS="-j2"
USE="multilib ntpl gnome esd -qt -kde -arts dvd alsa dvdr cdr"
#SYNC="rsync://ftp.belnet.be/gentoo/"
GENTOO_MIRRORS="ftp://ftp.gentoo.mesh-solutions.com/gentoo/ ftp://sunsite.inform
atik.rwth-aachen.de/pub/Linux/gentoo"
PORTDIR_OVERLAY="/usr/local/portage"
LINGUAS="fr fr_FR"
|
Code: | root@donato portage # pwd
/usr/local/portage
root@donato portage # mkdir app-emulation
root@donato portage # cp -rp /usr/portage/app-emulation/wine app-emulation/
root@donato portage # cp wine-20050310-amd64.diff app-emulation/wine/
root@donato portage # cd app-emulation/wine/
root@donato wine # patch wine-20050310.ebuild <wine-20050310-amd64.diff
patching file wine-20050310.ebuild
Hunk #1 FAILED at 27.
Hunk #2 FAILED at 86.
Hunk #3 FAILED at 108.
3 out of 3 hunks FAILED -- saving rejects to file wine-20050310.ebuild.rej
root@donato wine # ebuild wine-20050310.ebuild digest
>>> Generating digest file...
<<< Wine-20050310.tar.gz
>>> Generating manifest file...
<<< wine-20041019.ebuild
<<< ChangeLog
<<< metadata.xml
<<< wine-20041019-r3.ebuild
<<< wine-20050111.ebuild
<<< wine-20050211.ebuild
<<< wine-20050310.ebuild
<<< wine-20050310-amd64.diff
<<< files/winearts-kdecvs-fix.patch
<<< files/20041019-no-stack.patch
<<< files/20050211-docs.patch
<<< files/digest-wine-20041019
<<< files/digest-wine-20041019-r3
<<< files/digest-wine-20050111
<<< files/digest-wine-20050211
<<< files/digest-wine-20050310
>>> Computed message digests.
root@donato wine #
|
then Code: | root@donato wine # USE="-oss" emerge wine |
and still the error did I miss something?
sorry to bother you if i missed ... _________________ Ne tirez pas sur les canards !! |
|
Back to top |
|
|
Shapemaker n00b
Joined: 22 Aug 2004 Posts: 64 Location: Finland
|
Posted: Wed Mar 16, 2005 1:20 am Post subject: |
|
|
Heh, you did nothing wrong, but Vapier happened. The ebuild got bumped from version 1.1 to 1.2, hence the patch refused to apply. Here's a new one which should work. Save it as "wine-20050310-amd64-v1.2.diff" and patch the ebuild with that. Other instructions apply as before.
Code: | --- wine-20050310.ebuild.orig 2005-03-16 03:01:56.943817240 +0200
+++ wine-20050310.ebuild 2005-03-16 03:12:05.658151223 +0200
@@ -27,9 +27,9 @@
jpeg? ( media-libs/jpeg )
glut? ( virtual/glut )
lcms? ( media-libs/lcms )
- amd64? (
- app-emulation/emul-linux-x86-xlibs
- app-emulation/emul-linux-x86-soundlibs
+ amd64? ( X? app-emulation/emul-linux-x86-xlibs \
+ alsa? app-emulation/emul-linux-x86-soundlibs \
+ jack? app-emulation/emul-linux-x86-soundlibs
)"
DEPEND="${RDEPEND}
sys-devel/bison
@@ -86,6 +86,19 @@
export DB2PS=true
fi
+ if use amd64; then
+ if [ -f /usr/lib32/libX11.so ]; then
+ myconf="${myconf} --x-libraries=/usr/lib32"
+ elif [ -f /emul/linux/x86/usr/lib/libX11.so ]; then
+ myconf="${myconf} --x-libraries=/emul/linux/x86/usr/lib"
+ elif [ -f /emul/linux/x86/usr/X11R6/lib/libX11.so ]; then
+ myconf="${myconf} --x-libraries=/emul/linux/x86/usr/X11R6/lib"
+ else
+ eerror "Couldn't find your 32bit X libs"
+ die "Couldn't find your 32bit X libs"
+ fi
+ fi
+
# $(use_enable amd64 win64)
# USE=debug is broken in this release
econf \
@@ -95,6 +108,7 @@
$(use_with X x) \
$(use_enable debug trace) \
$(use_enable debug) \
+ ${myconf} \
|| die "configure failed"
emake -j1 depend || die "depend" |
Please let me know if that works. _________________ "Intellectual Property" should be an affront to anyone capable of independent thought. |
|
Back to top |
|
|
Delvin Guru
Joined: 07 Jul 2004 Posts: 546
|
Posted: Wed Mar 16, 2005 1:14 pm Post subject: |
|
|
still doesn't work, i have the same error when patching _________________ Ne tirez pas sur les canards !! |
|
Back to top |
|
|
Shapemaker n00b
Joined: 22 Aug 2004 Posts: 64 Location: Finland
|
Posted: Wed Mar 16, 2005 5:41 pm Post subject: |
|
|
Delvin wrote: | still doesn't work, i have the same error when patching |
Please do make an "emerge sync" and then copy fresh files from your portage dir to overlay. Then please post the first three lines of your wine-20050310.ebuild here. Both of the patches I've done work for me (with fresh files from sync), so there's something different in your configuration or files. Make sure your ebuild is either version 1.1 or 1.2 and then try the appropriate patch again. _________________ "Intellectual Property" should be an affront to anyone capable of independent thought. |
|
Back to top |
|
|
herbie Guru
Joined: 09 Oct 2002 Posts: 319 Location: London UK
|
Posted: Wed Mar 16, 2005 6:45 pm Post subject: |
|
|
all the above patch does is work out where your 32bit xibs are and provide --x-libraries as an argument to the configure script. You can get the same effect by running:
Code: | # EXTRA_ECONF="--x-libraries=/emul/linux/x86/usr/lib" emerge wine |
|
|
Back to top |
|
|
simkin Apprentice
Joined: 25 Jun 2003 Posts: 164
|
Posted: Mon Mar 21, 2005 7:36 pm Post subject: |
|
|
herbie wrote: | Code: | # EXTRA_ECONF="--x-libraries=/emul/linux/x86/usr/lib" emerge wine |
|
Fulminating solution! Thanks a lot, wine up and running |
|
Back to top |
|
|
Delvin Guru
Joined: 07 Jul 2004 Posts: 546
|
Posted: Thu Mar 24, 2005 8:35 pm Post subject: |
|
|
tryed the command line way and it works
i'm happy
sorry shapemaker for not having test your patch earlier because i'm trying to fix some others big troubles with my nvidia drivers, i saw this second solution and decided to try it and it worked
thanks everyone, now (when my nvidia drivers work) i'll try to play world of warcraft under linux ^^ _________________ Ne tirez pas sur les canards !! |
|
Back to top |
|
|
lramos85 Tux's lil' helper
Joined: 29 Jun 2004 Posts: 141 Location: Riverside, Ca
|
Posted: Sun Mar 27, 2005 11:15 am Post subject: |
|
|
Code: | EXTRA_ECONF="--x-libraries=/emul/linux/x86/usr/lib" emerge cedega |
Won't work with my ati-drivers, have you any idea of what to do?
Error:
Code: | Could not load graphics driver 'x11drv'
Could not load graphics driver 'x11drv' |
_________________ Registered Linux User #328996
Register Now!
Adpot an unanswered post today! |
|
Back to top |
|
|
benjamin200 Veteran
Joined: 01 Feb 2004 Posts: 1426 Location: DE Munich
|
Posted: Sun Mar 27, 2005 7:52 pm Post subject: |
|
|
Quote: |
Could not load graphics driver 'x11drv'
Could not load graphics driver 'x11drv'
|
It looks that your system miss x11-xorg - do you have them installed?
Thx,
Ben _________________ Gentoo Linux Stage1 / Kernel 2.6.18
AMD Athlon64 3500+ on Asus A8N-E / 1024 MB DDR-RAM / ATI X700 PCIe
Take LINUX and forget Blue Screens |
|
Back to top |
|
|
lramos85 Tux's lil' helper
Joined: 29 Jun 2004 Posts: 141 Location: Riverside, Ca
|
Posted: Mon Mar 28, 2005 5:44 pm Post subject: |
|
|
Yes, I have them install. I think its a problem with the ati-drivers and that I have amd64. I don't want to give up. Plus I spent $15 on cedega.
Code: | * x11-base/xorg-x11
Latest version available: 6.8.2-r1
Latest version installed: 6.8.2-r1
Size of downloaded files: 45,105 kB
Homepage: http://xorg.freedesktop.org/
Description: An X11 implementation maintained by the X.Org Foundation
|
_________________ Registered Linux User #328996
Register Now!
Adpot an unanswered post today! |
|
Back to top |
|
|
remix l33t
Joined: 28 Apr 2004 Posts: 797 Location: hawaii
|
Posted: Mon Mar 28, 2005 9:42 pm Post subject: |
|
|
herbie wrote: | all the above patch does is work out where your 32bit xibs are and provide --x-libraries as an argument to the configure script. You can get the same effect by running:
Code: | # EXTRA_ECONF="--x-libraries=/emul/linux/x86/usr/lib" emerge wine |
|
tried this, but i still get errors.
Code: |
/usr/lib/gcc/x86_64-pc-linux-gnu/3.4.3/../../../../x86_64-pc-linux-gnu/bin/ld: skipping incompatible /usr/lib/libXext.so when searching for -lXext
/usr/lib/gcc/x86_64-pc-linux-gnu/3.4.3/../../../../x86_64-pc-linux-gnu/bin/ld: skipping incompatible /usr/lib/libXext.a when searching for -lXext
/usr/lib/gcc/x86_64-pc-linux-gnu/3.4.3/../../../../x86_64-pc-linux-gnu/bin/ld: cannot find -lXext
collect2: ld returned 1 exit status
winegcc: gcc failed.
make[2]: *** [x11drv.dll.so] Error 2
make[2]: Leaving directory `/var/tmp/portage/wine-20050211/work/wine-20050211/dlls/x11drv'
make[1]: *** [x11drv] Error 2
make[1]: Leaving directory `/var/tmp/portage/wine-20050211/work/wine-20050211/dlls'
make: *** [dlls] Error 2
!!! ERROR: app-emulation/wine-20050211 failed.
!!! Function src_compile, Line 104, Exitcode 2
|
am i doing something wrong? _________________ help the needy |
|
Back to top |
|
|
herbie Guru
Joined: 09 Oct 2002 Posts: 319 Location: London UK
|
Posted: Tue Mar 29, 2005 12:34 am Post subject: |
|
|
Remix: Here's an updated patch for the current version, which should cure the -lXext issues as well as a couple of other things.
Code: | cd /usr/portage/app-emulation/wine
wget http://fermat.ma.rhul.ac.uk/~herbie/wine-amd64-fixes.patch
patch -p0 < wine-amd64-fixes.patch
emerge wine |
|
|
Back to top |
|
|
remix l33t
Joined: 28 Apr 2004 Posts: 797 Location: hawaii
|
Posted: Wed Mar 30, 2005 9:57 am Post subject: |
|
|
herbie wrote: | Remix: Here's an updated patch for the current version, which should cure the -lXext issues as well as a couple of other things.
Code: | cd /usr/portage/app-emulation/wine
wget http://fermat.ma.rhul.ac.uk/~herbie/wine-amd64-fixes.patch
patch -p0 < wine-amd64-fixes.patch
emerge wine |
|
i did that but i still get errors emerging, looks like a different probelm though.
Code: |
gcc -m32 -c -I. -I. -I../../include -I../../include -D__WINESRC__ -DWINE_NO_DEBUG_MSGS -DWINE_NO_TRACE_MSGS -D_NTSYSTEM_ -D_REENTRANT -fPIC -Wall -pipe -mpreferred-stack-boundary=2 -fno-strict-aliasing -gstabs+ -Wpointer-arith -O2 -L/emul/linux/x86/usr/lib -L/emul/linux/x86/lib -o signal_i386.o signal_i386.c
signal_i386.c: In function `wine_sigaction':
signal_i386.c:114: error: `SYS_sigaction' undeclared (first use in this function)
signal_i386.c:114: error: (Each undeclared identifier is reported only once
signal_i386.c:114: error: for each function it appears in.)
make[2]: *** [signal_i386.o] Error 1
make[2]: *** Waiting for unfinished jobs....
make[2]: Entering directory `/var/tmp/portage/wine-20050310/work/wine-20050310/dlls/oleacc'
gcc -m32 -c -I. -I. -I../../include -I../../include -D__WINESRC__ -DWINE_NO_DEBUG_MSGS -DWINE_NO_TRACE_MSGS -D_REENTRANT -fPIC -Wall -pipe -mpreferred-stack-boundary=2 -fno-strict-aliasing -gstabs+ -Wpointer-arith -O2 -L/emul/linux/x86/usr/lib -L/emul/linux/x86/lib -o main.o main.c
make[2]: Leaving directory `/var/tmp/portage/wine-20050310/work/wine-20050310/dlls/ntdll'
make[1]: *** [ntdll] Error 2
make[1]: *** Waiting for unfinished jobs....
../../tools/winebuild/winebuild -D__WINESRC__ -DWINE_NO_DEBUG_MSGS -DWINE_NO_TRACE_MSGS -o oleacc.dll.dbg.c --debug -C. main.c
gcc -m32 -c -I. -I. -I../../include -I../../include -D__WINESRC__ -DWINE_NO_DEBUG_MSGS -DWINE_NO_TRACE_MSGS -D_REENTRANT -fPIC -Wall -pipe -mpreferred-stack-boundary=2 -fno-strict-aliasing -gstabs+ -Wpointer-arith -O2 -L/emul/linux/x86/usr/lib -L/emul/linux/x86/lib -o oleacc.dll.dbg.o oleacc.dll.dbg.c
../../tools/winegcc/winegcc -B../../tools/winebuild -shared ./oleacc.spec main.o oleacc.dll.dbg.o -o oleacc.dll.so -L../../dlls -L../../libs/wine -lwine -L../../libs/port -lwine_port -L/emul/linux/x86/usr/lib -L/emul/linux/x86/lib
make[2]: Leaving directory `/var/tmp/portage/wine-20050310/work/wine-20050310/dlls/oleacc'
make[1]: Leaving directory `/var/tmp/portage/wine-20050310/work/wine-20050310/dlls'
make: *** [dlls] Error 2
!!! ERROR: app-emulation/wine-20050310 failed.
!!! Function src_compile, Line 126, Exitcode 2
!!! all
!!! If you need support, post the topmost build error, NOT this status message.
|
_________________ help the needy |
|
Back to top |
|
|
herbie Guru
Joined: 09 Oct 2002 Posts: 319 Location: London UK
|
Posted: Wed Mar 30, 2005 10:47 am Post subject: |
|
|
remix: looks like you're possibly not using the right kernel headers. Code: | emerge --oneshot '>=sys-kernel/linux-headers-2.6.8.1-r4' |
|
|
Back to top |
|
|
|