Re: [121029] trunk/dports/multimedia
Thanks. Applied in r121061. On Jun 15, 2014, at 4:07 PM, Mihai Moldovan wrote: > multimedia/audacious-plugins: set sdl1 and ffmpeg as default variants only if > sdl2 is not selected. > ___ > macports-dev mailing list > macports-dev@lists.macosforge.org > https://lists.macosforge.org/mailman/listinfo/macports-dev ___ macports-dev mailing list macports-dev@lists.macosforge.org https://lists.macosforge.org/mailman/listinfo/macports-dev
Re: [121029] trunk/dports/multimedia
multimedia/audacious-plugins: set sdl1 and ffmpeg as default variants only if
sdl2 is not selected.
--- multimedia/audacious-plugins/Portfile.old
+++ multimedia/audacious-plugins/Portfile
@@ -98,7 +98,7 @@ configure.args --enable-nls \
--disable-soxr \
--disable-glspectrum
-default_variants+full +sdl1
+default_variants+full
use_autoreconf yes
autoreconf.cmd ./autogen.sh
@@ -327,6 +327,10 @@ if {[variant_isset jack]} {
*** Please don't report bugs against this plugin."
}
+if {![variant_isset sdl2]} {
+default_variants-append +sdl1 +ffmpeg
+}
+
livecheck.type regex
livecheck.url ${master_sites}
livecheck.regex "${name}-(\\d+(?:\\.\\d+)*)${extract.suffix}"
smime.p7s
Description: S/MIME Cryptographic Signature
___
macports-dev mailing list
macports-dev@lists.macosforge.org
https://lists.macosforge.org/mailman/listinfo/macports-dev
Re: [121029] trunk/dports/multimedia
* On 15.06.2014 03:53 pm, Frank Schima wrote:
> default_variants +full
>
> if {![variant_isset sdl2]} {
> default_variants-append +sdl1
> }
>
> I can apply this change if you want?
Thanks for the idea.
Hold on, though, I'll send a patch later.
Mihai
smime.p7s
Description: S/MIME Cryptographic Signature
___
macports-dev mailing list
macports-dev@lists.macosforge.org
https://lists.macosforge.org/mailman/listinfo/macports-dev
Re: [121029] trunk/dports/multimedia
On Jun 14, 2014, at 10:17 PM, Mihai Moldovan wrote:
> This patch fixes the darwin typo, a TCL issue that has been shadowed by the
> aforementioned typo and doesn't explicitly check for the existence of
> ${configure.cxx_stdlib}.
>
> Also revbumped to have the correct min version target set.
>
Applied in r121042 [1].
The variants in audacious-plugins still need to be fixed.
$ sudo port install audacious-plugins +sdl2
Error: audacious-plugins: Variant sdl1 conflicts with sdl2
Error: Unable to open port: Error evaluating variants
For this you need to do something like:
default_variants +full
if {![variant_isset sdl2]} {
default_variants-append +sdl1
}
I can apply this change if you want?
Cheers!
Frank
[1] ___
macports-dev mailing list
macports-dev@lists.macosforge.org
https://lists.macosforge.org/mailman/listinfo/macports-dev
Re: [121029] trunk/dports/multimedia
This patch fixes the darwin typo, a TCL issue that has been shadowed by the
aforementioned typo and doesn't explicitly check for the existence of
${configure.cxx_stdlib}.
Also revbumped to have the correct min version target set.
--- multimedia/audacious/Portfile.old 2014-06-15 02:00:36.0 +0200
+++ multimedia/audacious/Portfile 2014-06-15 06:14:55.0 +0200
@@ -7,7 +7,7 @@
# Please keep audacious, audacious-core and audacious-plugins synchronized.
version 3.5
-revision0
+revision1
license BSD GPL-2+
categories multimedia
--- multimedia/audacious-core/Portfile.old 2014-06-15 02:00:36.0
+0200
+++ multimedia/audacious-core/Portfile 2014-06-15 06:14:50.0
+0200
@@ -8,7 +8,7 @@
# Please keep audacious, audacious-core and audacious-plugins synchronized.
version 3.5
-revision0
+revision1
license BSD
categories multimedia
@@ -56,19 +56,16 @@
autoreconf.cmd ./autogen.sh
autoreconf.args
-platform darin {
-if {[info exists configure.cxx_stdlib] &&
-${configure.cxx_stdlib} -ne {} &&
-${configure.cxx_stdlib} == "libc++"} {
+platform darwin {
+if {${configure.cxx_stdlib} ne {} &&
+[string equal ${configure.cxx_stdlib} "libc++"]} {
if {${os.major} > 10} {
configure.ldflags-append "-mmacosx-version-min=10.7"
-}
-else {
+} else {
ui_error "libc++ is only supported on OS X 10.7 and up for this
port."
error "libc++ supported on >= 10.7 only."
}
-}
-else {
+} else {
configure.ldflags-append "-mmacosx-version-min=10.5"
}
}
--- multimedia/audacious-plugins/Portfile.old 2014-06-15 02:00:36.0
+0200
+++ multimedia/audacious-plugins/Portfile 2014-06-15 06:14:52.0
+0200
@@ -7,7 +7,7 @@
# Please keep audacious, audacious-core and audacious-plugins synchronized.
version 3.5
-revision0
+revision1
# FIXME: probably more licenses involved here...
license BSD GPL-2+
@@ -104,19 +104,16 @@
autoreconf.cmd ./autogen.sh
autoreconf.args
-platform darin {
-if {[info exists configure.cxx_stdlib] &&
-${configure.cxx_stdlib} -ne {} &&
-${configure.cxx_stdlib} == "libc++"} {
+platform darwin {
+if {${configure.cxx_stdlib} ne {} &&
+[string equal ${configure.cxx_stdlib} "libc++"]} {
if {${os.major} > 10} {
configure.ldflags-append "-mmacosx-version-min=10.7"
-}
-else {
+} else {
ui_error "libc++ is only supported on OS X 10.7 and up for this
port."
error "libc++ supported on >= 10.7 only."
}
-}
-else {
+} else {
configure.ldflags-append "-mmacosx-version-min=10.5"
}
}
smime.p7s
Description: S/MIME Cryptographic Signature
___
macports-dev mailing list
macports-dev@lists.macosforge.org
https://lists.macosforge.org/mailman/listinfo/macports-dev
Re: [121029] trunk/dports/multimedia
* On 15.06.2014 03:40 am, Mihai Moldovan wrote:
> * On 15.06.2014 02:51 am, Ryan Schmidt wrote:
>>> +if {[info exists configure.cxx_stdlib] &&
>> Now that MacPorts 2.3.0 has been released, configure.cxx_stdlib does exist,
>> so there's no need to check for it.
> What's a better way to handle this? That is, how do you check the selected C++
> stdlib with MacPorts 2.3.0+?
> Later versions (the Audacious team is currently rewriting the application in
> C++) will be libc++ only, so the issue will be even more pressing then. It'll
> take some good time till then, though.
Misread that as "configure.cxx_stdlib doesn't exist". Please ignore the comment
above.
Also, do you take patches on the mailing list?
Mihai
smime.p7s
Description: S/MIME Cryptographic Signature
___
macports-dev mailing list
macports-dev@lists.macosforge.org
https://lists.macosforge.org/mailman/listinfo/macports-dev
Re: [121029] trunk/dports/multimedia
* On 15.06.2014 02:51 am, Ryan Schmidt wrote:
> On Jun 14, 2014, at 6:42 PM, m...@macports.org wrote:
>
> libtool is also usually needed to autoreconf. You should verify whether this
> port builds ok when libtool is deactivated; if not, add the libtool build
> dependency as well.
I built with trace mode enabled. It didn't complain about libtool or I would
have added that dependency.
I didn't actually deactivate libtool prior, though.
>> +platform darin {
> "darwin" is misspelled.
Ouch, it is. I'm so sorry! Even in a critical section.
>> +if {[info exists configure.cxx_stdlib] &&
> Now that MacPorts 2.3.0 has been released, configure.cxx_stdlib does exist,
> so there's no need to check for it.
What's a better way to handle this? That is, how do you check the selected C++
stdlib with MacPorts 2.3.0+?
Later versions (the Audacious team is currently rewriting the application in
C++) will be libc++ only, so the issue will be even more pressing then. It'll
take some good time till then, though.
>> +default_variants+full +sdl1
> +sdl1 should only be selected if the user has not already selected
> conflicting variant +sdl2.
Audacious either needs sdl1, sdl2 or jack on OS X. Else, you won't get any sound
output.
I added +sdl1 as a default variant so that users just installing audacious
without any variants will always get a working player.
Users who are interested in selecting sdl2 will need to specifically disable
-sdl1.
I think that's fair.
If you have a better solution, shoot. I'm not saying mine is too good, but at
least it gets the job done. I'm really interested in getting input on this.
What I'd really want to have is enabling sdl1 whenever sdl2 is not selected.
Mihai
smime.p7s
Description: S/MIME Cryptographic Signature
___
macports-dev mailing list
macports-dev@lists.macosforge.org
https://lists.macosforge.org/mailman/listinfo/macports-dev
Re: [121029] trunk/dports/multimedia
+platform darin {
Both audacious-core and audacious-plugins contain this line. I think
you "darwin".
Craig
___
macports-dev mailing list
macports-dev@lists.macosforge.org
https://lists.macosforge.org/mailman/listinfo/macports-dev
Re: [121029] trunk/dports/multimedia
On Jun 14, 2014, at 6:42 PM, m...@macports.org wrote:
> Revision
> 121029
> Author
> m...@macports.org
> Date
> 2014-06-14 16:42:28 -0700 (Sat, 14 Jun 2014)
> Log Message
>
> audacious audacious-core audacious-plugins: New ports. (#25260)
> --- trunk/dports/multimedia/audacious-core/Portfile
> (rev 0)
> +++ trunk/dports/multimedia/audacious-core/Portfile 2014-06-14 23:42:28 UTC
> (rev 121029)
> +depends_build path:bin/pkg-config:pkgconfig \
> +path:bin/aclocal:automake \
> +path:bin/autom4te:autoconf
> +use_autoreconf yes
> +autoreconf.cmd ./autogen.sh
> +autoreconf.args
libtool is also usually needed to autoreconf. You should verify whether this
port builds ok when libtool is deactivated; if not, add the libtool build
dependency as well.
> +platform darin {
"darwin" is misspelled.
> +if {[info exists configure.cxx_stdlib] &&
Now that MacPorts 2.3.0 has been released, configure.cxx_stdlib does exist, so
there's no need to check for it.
> --- trunk/dports/multimedia/audacious-plugins/Portfile
> (rev 0)
> +++ trunk/dports/multimedia/audacious-plugins/Portfile2014-06-14
> 23:42:28 UTC (rev 121029)
The same comments as above apply to this port, and also:
> +default_variants+full +sdl1
+sdl1 should only be selected if the user has not already selected conflicting
variant +sdl2.
___
macports-dev mailing list
macports-dev@lists.macosforge.org
https://lists.macosforge.org/mailman/listinfo/macports-dev
