Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 285909 Details for
Bug 310821
New package: media-sound/mixxx
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
patch for fixing configure and compile, also try to fix linking (but still errors)
fix-configure-and-try-fix-linking.patch (text/plain), 6.09 KB, created by
Andrey
on 2011-09-09 05:33:54 UTC
(
hide
)
Description:
patch for fixing configure and compile, also try to fix linking (but still errors)
Filename:
MIME Type:
Creator:
Andrey
Created:
2011-09-09 05:33:54 UTC
Size:
6.09 KB
patch
obsolete
>diff -uNrp build.old/depends.py build/depends.py >--- build.old/depends.py 2011-09-09 08:56:29.532780462 +0400 >+++ build/depends.py 2011-09-09 09:29:37.703924903 +0400 >@@ -42,10 +42,10 @@ class OpenGL(Dependence): > not conf.CheckCHeader('GL/gl.h')): > raise Exception('Did not find OpenGL development files, exiting!') > >- if (not conf.CheckLib('GLU') and >- not conf.CheckLib('glu32') and >- not conf.CheckCHeader('/System/Library/Frameworks/OpenGL.framework/Versions/A/Headers/glu.h')): >- raise Exception('Did not find GLU development files, exiting!') >+ #if (not conf.CheckLib('GLU') and >+ # not conf.CheckLib('glu32') and >+ # not conf.CheckCHeader('/System/Library/Frameworks/OpenGL.framework/Versions/A/Headers/glu.h')): >+ # raise Exception('Did not find GLU development files, exiting!') > > if build.platform_is_osx: > build.env.Append(CPPPATH='/Library/Frameworks/OpenGL.framework/Headers/') >@@ -53,23 +53,23 @@ class OpenGL(Dependence): > > class OggVorbis(Dependence): > >- def configure(self, build, conf): >+ #def configure(self, build, conf): > # if build.platform_is_windows and build.machine_is_64bit: > # For some reason this has to be checked this way on win64, > # otherwise it looks for the dll lib which will cause a conflict > # later >-# if not conf.CheckLib('vorbisfile_static'): >-# raise Exception('Did not find vorbisfile_static.lib or the libvorbisfile development headers.') >+# #if not conf.CheckLib('vorbisfile_static'): >+# # raise Exception('Did not find vorbisfile_static.lib or the libvorbisfile development headers.') > # else: >- if not conf.CheckLib(['libvorbisfile', 'vorbisfile']): >- Exception('Did not find libvorbisfile.a, libvorbisfile.lib, ' >- 'or the libvorbisfile development headers.') >+ #if not conf.CheckLib(['libvorbisfile', 'vorbisfile']): >+ # Exception('Did not find libvorbisfile.a, libvorbisfile.lib, ' >+ # 'or the libvorbisfile development headers.') > >- if not conf.CheckLib(['libvorbis', 'vorbis']): >- raise Exception('Did not find libvorbis.a, libvorbis.lib, or the libvorbisfile development headers.') >+ #if not conf.CheckLib(['libvorbis', 'vorbis']): >+ # raise Exception('Did not find libvorbis.a, libvorbis.lib, or the libvorbisfile development headers.') > >- if not conf.CheckLib(['libogg', 'ogg']): >- raise Exception('Did not find libogg.a, libogg.lib, or the libogg development headers, exiting!') >+ #if not conf.CheckLib(['libogg', 'ogg']): >+ # raise Exception('Did not find libogg.a, libogg.lib, or the libogg development headers, exiting!') > > def sources(self, build): > return ['soundsourceoggvorbis.cpp'] >@@ -79,8 +79,8 @@ class SndFile(Dependence): > > def configure(self, build, conf): > #if not conf.CheckLibWithHeader(['sndfile', 'libsndfile'], 'sndfile.h', 'C'): >- if not conf.CheckLib(['sndfile', 'libsndfile']): >- raise Exception("Did not find libsndfile or it\'s development headers, exiting!") >+ #if not conf.CheckLib(['sndfile', 'libsndfile']): >+ # raise Exception("Did not find libsndfile or it\'s development headers, exiting!") > build.env.Append(CPPDEFINES = '__SNDFILE__') > > def sources(self, build): >@@ -88,10 +88,10 @@ class SndFile(Dependence): > > class FLAC(Dependence): > def configure(self, build, conf): >- if not conf.CheckHeader('FLAC/stream_decoder.h'): >- raise Exception('Did not find libFLAC development headers, exiting!') >- elif not conf.CheckLib(['libFLAC', 'FLAC']): >- raise Exception('Did not find libFLAC development libraries, exiting!') >+ #if not conf.CheckHeader('FLAC/stream_decoder.h'): >+ # raise Exception('Did not find libFLAC development headers, exiting!') >+ #elif not conf.CheckLib(['libFLAC', 'FLAC']): >+ # raise Exception('Did not find libFLAC development libraries, exiting!') > return > > def sources(self, build): >@@ -190,6 +190,9 @@ class Qt(Dependence): > #QtSQLite DLL > if build.platform_is_windows: > build.flags['sqlitedll'] = util.get_flags(build.env, 'sqlitedll', 1) >+ >+ # add missed linker options >+ build.env.Append(LINKFLAGS = "-L/usr/lib64/qt4 -lQtSql -lQtCore -ltag -lFLAC -lm -lmad -lvorbis -logg") > > > class FidLib(Dependence): >@@ -252,8 +255,8 @@ class SoundTouch(Dependence): > > class TagLib(Dependence): > def configure(self, build, conf): >- if not conf.CheckLib('tag'): >- raise Exception("Could not find libtag or its development headers.") >+ #if not conf.CheckLib('tag'): >+ # raise Exception("Could not find libtag or its development headers.") > > # Karmic seems to have an issue with mp4tag.h where they don't include > # the files correctly. Adding this folder ot the include path should fix >diff -uNrp build.old/features.py build/features.py >--- build.old/features.py 2011-09-09 08:56:29.532780462 +0400 >+++ build/features.py 2011-09-09 09:02:14.041473509 +0400 >@@ -65,10 +65,10 @@ class Mad(Feature): > def configure(self, build, conf): > if not self.enabled(build): > return >- if not conf.CheckLib(['libmad','mad']): >- raise Exception('Did not find libmad.a, libmad.lib, or the libmad development header files - exiting!') >- if not conf.CheckLib(['libid3tag', 'id3tag','libid3tag-release']): >- raise Exception('Did not find libid3tag.a, libid3tag.lib, or the libid3tag development header files - exiting!') >+ #if not conf.CheckLib(['libmad','mad']): >+ # raise Exception('Did not find libmad.a, libmad.lib, or the libmad development header files - exiting!') >+ #if not conf.CheckLib(['libid3tag', 'id3tag','libid3tag-release']): >+ # raise Exception('Did not find libid3tag.a, libid3tag.lib, or the libid3tag development header files - exiting!') > build.env.Append(CPPDEFINES = '__MAD__') > > def sources(self, build):
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 310821
:
226007
|
226199
|
226205
|
227661
|
239449
|
239603
|
243641
|
246729
|
248423
|
248425
|
248440
|
249661
|
250641
|
251185
|
251187
|
251209
|
253019
|
254029
|
254031
|
254033
|
254039
|
254041
|
254051
|
254531
|
254677
|
256517
|
256519
|
256520
|
257797
|
257798
|
257801
|
263367
|
283325
|
284457
| 285909 |
285911
|
286399
|
286401
|
286501
|
287921
|
291857
|
305427