Re: [PATCH] Explicitly link to vorbis and ogg

2014-09-28 Thread Sergei Trofimovich
On Mon, 17 Feb 2014 14:50:33 + (UTC)
Pascal Terjan pter...@google.com wrote:

Hi Pascal!

Your patch already sits in main git tree for a while:

http://git.xmms2.org/xmms2/xmms2-devel/commit/?id=d1ceb036e0214a45890ffb87b54af8dfaafd972b

Could it be you've send wrong one?

 vorbisenc is no longer overlinking and ripper.c uses symbols from both.
 
 https://git.xiph.org/?
 p=mirrors/vorbis.git;a=commitdiff;h=24b8f4f4c2f2e3f47738fe5838197ec2a4dc
 ---
  src/clients/vistest/wscript | 11 ---
  1 file changed, 8 insertions(+), 3 deletions(-)
 
 diff --git a/src/clients/vistest/wscript b/src/clients/vistest/wscript
 index 616d65a..7ec4510 100644
 --- a/src/clients/vistest/wscript
 +++ b/src/clients/vistest/wscript
 @@ -28,7 +28,7 @@ def build(bld):
  target = 'xmms2-ripper',
  source = 'ripper.c',
  includes = '. ../../.. ../../include',
 -uselib = 'vorbisenc',
 +uselib = 'vorbisenc vorbis ogg',
  use = 'xmmsclient'
  )
  if not bld.env.INSTALL_VIS_REFERENCE_CLIENTS:
 @@ -53,8 +53,13 @@ def configure(conf):
  
  conf.check_cc(lib=m, uselib_store=math, mandatory=False)
  
 -conf.check_cfg(package='vorbisenc', uselib_store='vorbisenc',
 -args='--cflags --libs', mandatory=False)
 +if conf.check_cfg(package='vorbisenc', uselib_store='vorbisenc',
 +args='--cflags --libs', mandatory=False):
 +conf.check_cfg(package='vorbis', uselib_store='vorbis',
 +args='--cflags --libs', mandatory=True)
 +conf.check_cfg(package='ogg', uselib_store='ogg',
 +args='--cflags --libs', mandatory=True)
 +
  
  if conf.check_cfg(package='libvisual-0.4', uselib_store='visual',
  args='--cflags --libs', mandatory=False):
 -- 
 1.8.5.4
 
 
 
 --
 ___
 Xmms2-devel mailing list
 Xmms2-devel@lists.xmms2.org
 http://lists.xmms2.org/cgi-bin/mailman/listinfo/xmms2-devel


-- 

  Sergei


signature.asc
Description: PGP signature
--
___
Xmms2-devel mailing list
Xmms2-devel@lists.xmms2.org
http://lists.xmms2.org/cgi-bin/mailman/listinfo/xmms2-devel


Re: [PATCH] Explicitly link to vorbis and ogg

2014-09-28 Thread Sergei Trofimovich
On Sun, 28 Sep 2014 12:13:26 +0100
Pascal Terjan pter...@google.com wrote:

 I haven't sent anything since as far as I know :)

Oh, It's my email delivery was busted
and I got your email only 2 days ago.

Sorry for the noise.

 On 28 Sep 2014 12:40, Sergei Trofimovich sly...@gmail.com wrote:
 
  On Mon, 17 Feb 2014 14:50:33 + (UTC)
  Pascal Terjan pter...@google.com wrote:
 
  Hi Pascal!
 
  Your patch already sits in main git tree for a while:
 
  http://git.xmms2.org/xmms2/xmms2-devel/commit/?id=d1ceb036e0214a45890ffb87b54af8dfaafd972b
 
  Could it be you've send wrong one?
 
   vorbisenc is no longer overlinking and ripper.c uses symbols from both.
  
   https://git.xiph.org/?
  
  p=mirrors/vorbis.git;a=commitdiff;h=24b8f4f4c2f2e3f47738fe5838197ec2a4dc
   ---
src/clients/vistest/wscript | 11 ---
1 file changed, 8 insertions(+), 3 deletions(-)
  
   diff --git a/src/clients/vistest/wscript b/src/clients/vistest/wscript
   index 616d65a..7ec4510 100644
   --- a/src/clients/vistest/wscript
   +++ b/src/clients/vistest/wscript
   @@ -28,7 +28,7 @@ def build(bld):
target = 'xmms2-ripper',
source = 'ripper.c',
includes = '. ../../.. ../../include',
   -uselib = 'vorbisenc',
   +uselib = 'vorbisenc vorbis ogg',
use = 'xmmsclient'
)
if not bld.env.INSTALL_VIS_REFERENCE_CLIENTS:
   @@ -53,8 +53,13 @@ def configure(conf):
  
conf.check_cc(lib=m, uselib_store=math, mandatory=False)
  
   -conf.check_cfg(package='vorbisenc', uselib_store='vorbisenc',
   -args='--cflags --libs', mandatory=False)
   +if conf.check_cfg(package='vorbisenc', uselib_store='vorbisenc',
   +args='--cflags --libs', mandatory=False):
   +conf.check_cfg(package='vorbis', uselib_store='vorbis',
   +args='--cflags --libs', mandatory=True)
   +conf.check_cfg(package='ogg', uselib_store='ogg',
   +args='--cflags --libs', mandatory=True)
   +
  
if conf.check_cfg(package='libvisual-0.4', uselib_store='visual',
args='--cflags --libs', mandatory=False):
   --
   1.8.5.4
  
  
  
   --
   ___
   Xmms2-devel mailing list
   Xmms2-devel@lists.xmms2.org
   http://lists.xmms2.org/cgi-bin/mailman/listinfo/xmms2-devel
 
 
  --
 
Sergei
 


-- 

  Sergei


signature.asc
Description: PGP signature
--
___
Xmms2-devel mailing list
Xmms2-devel@lists.xmms2.org
http://lists.xmms2.org/cgi-bin/mailman/listinfo/xmms2-devel