xmms2-waf.patch

   1 --- xmms2-0.2DrJekyll/src/xmms/wscript.orig     2007-05-20 17:55:40.000000000 +0200
   2 +++ xmms2-0.2DrJekyll/src/xmms/wscript  2023-05-15 20:02:20.740596198 +0200
   3 @@ -70,7 +70,7 @@ def configure(conf):
   4
   5      # Check for the sin function in the math lib
   6      test = conf.create(enumerator='function')
   7 -    test.function = 'sin'
   8 +    test.function = 'sinf'
   9      test.headers = ['math.h']
  10      test.libs = ['m']
  11      test.mandatory = 1
  12 --- xmms2-0.4DrKosmos/wscript.orig      2007-11-15 19:25:07.000000000 +0100
  13 +++ xmms2-0.4DrKosmos/wscript   2023-05-20 15:03:03.017536689 +0200
  14 @@ -244,8 +244,6 @@ def configure(conf):
  15          Params.g_platform = Params.g_options.target_platform
  16
  17      conf.env["VERSION"] = VERSION
  18 -    conf.env["CCFLAGS"] = Utils.to_list(conf.env["CCFLAGS"]) + ['-g', '-O0']
  19 -    conf.env["CXXFLAGS"] = Utils.to_list(conf.env["CXXFLAGS"]) + ['-g', '-O0']
  20      conf.env['XMMS_PKGCONF_FILES'] = []
  21      conf.env['XMMS_OUTPUT_PLUGINS'] = [(-1, "NONE")]
  22
  23 --- xmms2-0.2DrJekyll/waftools/pkgconfig.py.orig        2007-05-20 17:55:40.000000000 +0200
  24 +++ xmms2-0.2DrJekyll/waftools/pkgconfig.py     2023-05-19 17:20:32.982353210 +0200
  25 @@ -20,7 +20,7 @@ class pkgcobj(copyobj):
  26              p = self.env["PREFIX"]
  27              val["PREFIX"] = p
  28              val["BINDIR"] = os.path.join("${prefix}", "bin")
  29 -            val["LIBDIR"] = os.path.join("${prefix}", "lib")
  30 +            val["LIBDIR"] = self.env["LIBDIR"]
  31              val["INCLUDEDIR"] = os.path.join("${prefix}", "include", "xmms2")
  32              val["VERSION"] = self.version
  33
  34 --- xmms2-0.4DrKosmos/src/include/xmms/wscript.orig     2023-05-20 18:07:08.337699055 +0200
  35 +++ xmms2-0.4DrKosmos/src/include/xmms/wscript  2023-05-20 19:51:04.783913328 +0200
  36 @@ -12,8 +12,8 @@ def configure(conf):
  37
  38      defs = {}
  39
  40 -    defs['PKGLIBDIR'] = os.path.join(conf.env['PREFIX'],
  41 -                                     'lib', 'xmms2')
  42 +    defs['PKGLIBDIR'] = os.path.join(conf.env['LIBDIR'],
  43 +                                     'xmms2')
  44      defs['BINDIR'] = os.path.join(conf.env['PREFIX'],
  45                                    'bin')
  46      defs['SHAREDDIR'] = os.path.join(conf.env['PREFIX'],
  47 @@ -38,7 +38,7 @@ def configure(conf):
  48
  49      conf.env['XMMS_DEFS'] = defs
  50      conf.env['PLUGINDIR'] = defs['PKGLIBDIR']
  51 -    conf.env['PKGCONFIGDIR'] = os.path.join(conf.env["PREFIX"], "lib", "pkgconfig")
  52 +    conf.env['PKGCONFIGDIR'] = os.path.join(conf.env["LIBDIR"], "pkgconfig")
  53
  54      # The plugin path in Windows should be relative, not absolute
  55      if Params.g_platform == 'win32':