| Message ID | 20180513150748.2106-1-ffmpeg@haasn.xyz |
|---|---|
| State | Accepted |
| Commit | 32234e03a792e3ceca58359d6f2b7244ceb6b77f |
| Headers | show |
On Sun, May 13, 2018 at 6:07 PM, Niklas Haas <ffmpeg@haasn.xyz> wrote: > From: Niklas Haas <git@haasn.xyz> > > This should be included as `<lilv/lilv.h>`, same as is done in af_lv2.c. > Forcing the extra lilv-0 breaks platforms where the include dir is > `/usr/include/lilv/lilv.h` rather than > `/usr/include/lilv-0/lilv/lilv.h`. > > The new include path works for both, because the `pkg-config --cflags` > includes `-I/usr/include/lilv-0`. > --- > configure | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/configure b/configure > index a1f13a7109..451d1937b7 100755 > --- a/configure > +++ b/configure > @@ -5973,7 +5973,7 @@ enabled gnutls && require_pkg_config gnutls gnutls gnutls/gnutls.h gn > enabled jni && { [ $target_os = "android" ] && check_header jni.h && enabled pthreads || die "ERROR: jni not found"; } > enabled ladspa && require_header ladspa.h > enabled libaom && require_pkg_config libaom "aom >= 0.1.0" aom/aom_codec.h aom_codec_version > -enabled lv2 && require_pkg_config lv2 lilv-0 "lilv-0/lilv/lilv.h" lilv_world_new > +enabled lv2 && require_pkg_config lv2 lilv-0 "lilv/lilv.h" lilv_world_new > enabled libiec61883 && require libiec61883 libiec61883/iec61883.h iec61883_cmp_connect -lraw1394 -lavc1394 -lrom1394 -liec61883 > enabled libass && require_pkg_config libass libass ass/ass.h ass_library_init > enabled libbluray && require_pkg_config libbluray libbluray libbluray/bluray.h bd_open > -- > 2.17.0 > Generally looks good, CC'ing Paul so he can verify that it still builds for him as well. Jan
On 5/13/18, Jan Ekstroem <jeebjp@gmail.com> wrote: > On Sun, May 13, 2018 at 6:07 PM, Niklas Haas <ffmpeg@haasn.xyz> wrote: >> From: Niklas Haas <git@haasn.xyz> >> >> This should be included as `<lilv/lilv.h>`, same as is done in af_lv2.c. >> Forcing the extra lilv-0 breaks platforms where the include dir is >> `/usr/include/lilv/lilv.h` rather than >> `/usr/include/lilv-0/lilv/lilv.h`. >> >> The new include path works for both, because the `pkg-config --cflags` >> includes `-I/usr/include/lilv-0`. >> --- >> configure | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/configure b/configure >> index a1f13a7109..451d1937b7 100755 >> --- a/configure >> +++ b/configure >> @@ -5973,7 +5973,7 @@ enabled gnutls && require_pkg_config >> gnutls gnutls gnutls/gnutls.h gn >> enabled jni && { [ $target_os = "android" ] && check_header >> jni.h && enabled pthreads || die "ERROR: jni not found"; } >> enabled ladspa && require_header ladspa.h >> enabled libaom && require_pkg_config libaom "aom >= 0.1.0" >> aom/aom_codec.h aom_codec_version >> -enabled lv2 && require_pkg_config lv2 lilv-0 >> "lilv-0/lilv/lilv.h" lilv_world_new >> +enabled lv2 && require_pkg_config lv2 lilv-0 "lilv/lilv.h" >> lilv_world_new >> enabled libiec61883 && require libiec61883 libiec61883/iec61883.h >> iec61883_cmp_connect -lraw1394 -lavc1394 -lrom1394 -liec61883 >> enabled libass && require_pkg_config libass libass ass/ass.h >> ass_library_init >> enabled libbluray && require_pkg_config libbluray libbluray >> libbluray/bluray.h bd_open >> -- >> 2.17.0 >> > > Generally looks good, CC'ing Paul so he can verify that it still > builds for him as well. Why are you CCing me?
On 5/13/18, Niklas Haas <ffmpeg@haasn.xyz> wrote: > From: Niklas Haas <git@haasn.xyz> > > This should be included as `<lilv/lilv.h>`, same as is done in af_lv2.c. > Forcing the extra lilv-0 breaks platforms where the include dir is > `/usr/include/lilv/lilv.h` rather than > `/usr/include/lilv-0/lilv/lilv.h`. > > The new include path works for both, because the `pkg-config --cflags` > includes `-I/usr/include/lilv-0`. > --- > configure | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > lgtm
On Sun, May 13, 2018 at 6:52 PM, Paul B Mahol <onemda@gmail.com> wrote: > On 5/13/18, Niklas Haas <ffmpeg@haasn.xyz> wrote: >> From: Niklas Haas <git@haasn.xyz> >> >> This should be included as `<lilv/lilv.h>`, same as is done in af_lv2.c. >> Forcing the extra lilv-0 breaks platforms where the include dir is >> `/usr/include/lilv/lilv.h` rather than >> `/usr/include/lilv-0/lilv/lilv.h`. >> >> The new include path works for both, because the `pkg-config --cflags` >> includes `-I/usr/include/lilv-0`. >> --- >> configure | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> > > lgtm Thank you. Pushed in. Should this be back-ported to release/4.0 as well? Jan
On 5/13/18, Jan Ekstroem <jeebjp@gmail.com> wrote: > On Sun, May 13, 2018 at 6:52 PM, Paul B Mahol <onemda@gmail.com> wrote: >> On 5/13/18, Niklas Haas <ffmpeg@haasn.xyz> wrote: >>> From: Niklas Haas <git@haasn.xyz> >>> >>> This should be included as `<lilv/lilv.h>`, same as is done in af_lv2.c. >>> Forcing the extra lilv-0 breaks platforms where the include dir is >>> `/usr/include/lilv/lilv.h` rather than >>> `/usr/include/lilv-0/lilv/lilv.h`. >>> >>> The new include path works for both, because the `pkg-config --cflags` >>> includes `-I/usr/include/lilv-0`. >>> --- >>> configure | 2 +- >>> 1 file changed, 1 insertion(+), 1 deletion(-) >>> >> >> lgtm > > Thank you. Pushed in. > > Should this be back-ported to release/4.0 as well? If you care.
On Sun, May 13, 2018 at 7:12 PM, Paul B Mahol <onemda@gmail.com> wrote: > On 5/13/18, Jan Ekstroem <jeebjp@gmail.com> wrote: >> On Sun, May 13, 2018 at 6:52 PM, Paul B Mahol <onemda@gmail.com> wrote: >>> On 5/13/18, Niklas Haas <ffmpeg@haasn.xyz> wrote: >>>> From: Niklas Haas <git@haasn.xyz> >>>> >>>> This should be included as `<lilv/lilv.h>`, same as is done in af_lv2.c. >>>> Forcing the extra lilv-0 breaks platforms where the include dir is >>>> `/usr/include/lilv/lilv.h` rather than >>>> `/usr/include/lilv-0/lilv/lilv.h`. >>>> >>>> The new include path works for both, because the `pkg-config --cflags` >>>> includes `-I/usr/include/lilv-0`. >>>> --- >>>> configure | 2 +- >>>> 1 file changed, 1 insertion(+), 1 deletion(-) >>>> >>> >>> lgtm >> >> Thank you. Pushed in. >> >> Should this be back-ported to release/4.0 as well? > > If you care. You may say that I do not care, but I have this still vivid in my memory and I would guess you would like your filter to build better in releases as well. Best regards, Jan
On Sun, May 13, 2018 at 7:12 PM, Paul B Mahol <onemda@gmail.com> wrote: > On 5/13/18, Jan Ekstroem <jeebjp@gmail.com> wrote: >> On Sun, May 13, 2018 at 6:52 PM, Paul B Mahol <onemda@gmail.com> wrote: >>> On 5/13/18, Niklas Haas <ffmpeg@haasn.xyz> wrote: >>>> From: Niklas Haas <git@haasn.xyz> >>>> >>>> This should be included as `<lilv/lilv.h>`, same as is done in af_lv2.c. >>>> Forcing the extra lilv-0 breaks platforms where the include dir is >>>> `/usr/include/lilv/lilv.h` rather than >>>> `/usr/include/lilv-0/lilv/lilv.h`. >>>> >>>> The new include path works for both, because the `pkg-config --cflags` >>>> includes `-I/usr/include/lilv-0`. >>>> --- >>>> configure | 2 +- >>>> 1 file changed, 1 insertion(+), 1 deletion(-) >>>> >>> >>> lgtm >> >> Thank you. Pushed in. >> >> Should this be back-ported to release/4.0 as well? > > If you care. And thus, back-ported to release/4.0. Jan
diff --git a/configure b/configure index a1f13a7109..451d1937b7 100755 --- a/configure +++ b/configure @@ -5973,7 +5973,7 @@ enabled gnutls && require_pkg_config gnutls gnutls gnutls/gnutls.h gn enabled jni && { [ $target_os = "android" ] && check_header jni.h && enabled pthreads || die "ERROR: jni not found"; } enabled ladspa && require_header ladspa.h enabled libaom && require_pkg_config libaom "aom >= 0.1.0" aom/aom_codec.h aom_codec_version -enabled lv2 && require_pkg_config lv2 lilv-0 "lilv-0/lilv/lilv.h" lilv_world_new +enabled lv2 && require_pkg_config lv2 lilv-0 "lilv/lilv.h" lilv_world_new enabled libiec61883 && require libiec61883 libiec61883/iec61883.h iec61883_cmp_connect -lraw1394 -lavc1394 -lrom1394 -liec61883 enabled libass && require_pkg_config libass libass ass/ass.h ass_library_init enabled libbluray && require_pkg_config libbluray libbluray libbluray/bluray.h bd_open
From: Niklas Haas <git@haasn.xyz> This should be included as `<lilv/lilv.h>`, same as is done in af_lv2.c. Forcing the extra lilv-0 breaks platforms where the include dir is `/usr/include/lilv/lilv.h` rather than `/usr/include/lilv-0/lilv/lilv.h`. The new include path works for both, because the `pkg-config --cflags` includes `-I/usr/include/lilv-0`. --- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)