* [Buildroot] [PATCH 1/2] x265: new package
@ 2015-10-24 19:50 Thijs Vermeir
2015-10-24 19:50 ` [Buildroot] [PATCH 2/2] gst1-plugins-bad: add x265 plugin Thijs Vermeir
2015-10-25 21:29 ` [Buildroot] [PATCH 1/2] x265: new package Peter Korsgaard
0 siblings, 2 replies; 8+ messages in thread
From: Thijs Vermeir @ 2015-10-24 19:50 UTC (permalink / raw)
To: buildroot
x265 is a H.265 / HEVC video encoder application library, designed to encode
video or images into an H.265 / HEVC encoded bitstream.
http://x265.org
Signed-off-by: Thijs Vermeir <thijsvermeir@gmail.com>
---
package/Config.in | 1 +
package/x265/Config.in | 23 +++++++++++++++++++++++
package/x265/x265.hash | 2 ++
package/x265/x265.mk | 31 +++++++++++++++++++++++++++++++
4 files changed, 57 insertions(+)
create mode 100644 package/x265/Config.in
create mode 100644 package/x265/x265.hash
create mode 100644 package/x265/x265.mk
diff --git a/package/Config.in b/package/Config.in
index 2f74439..10ff94e 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -978,6 +978,7 @@ menu "Multimedia"
source "package/live555/Config.in"
source "package/mediastreamer/Config.in"
source "package/x264/Config.in"
+ source "package/x265/Config.in"
endmenu
menu "Networking"
diff --git a/package/x265/Config.in b/package/x265/Config.in
new file mode 100644
index 0000000..4d202a9
--- /dev/null
+++ b/package/x265/Config.in
@@ -0,0 +1,23 @@
+config BR2_PACKAGE_X265
+ bool "x265"
+ depends on BR2_INSTALL_LIBSTDCPP
+ help
+ x265 is an open source free software and library for encoding video
+ using the High Efficiency Video Coding (HEVC/H.265) standard. x265 is
+ offered under either the GNU General Public License (GPL) 2 license or
+ a commercial license, similar to the x264 project.
+
+ http://x265.org
+
+if BR2_PACKAGE_X265
+
+config BR2_PACKAGE_X265_CLI
+ bool "CLI"
+ help
+ Command-line tool to encode video streams into the
+ H.265/HEVC compression format.
+
+endif
+
+comment "x265 needs a toolchain w/ C++"
+ depends on !BR2_INSTALL_LIBSTDCPP
diff --git a/package/x265/x265.hash b/package/x265/x265.hash
new file mode 100644
index 0000000..714ec2a
--- /dev/null
+++ b/package/x265/x265.hash
@@ -0,0 +1,2 @@
+# Locally generated
+sha256 760e6280c688f1ea90c492d19fc6d4084ca1c4b0ea9b2e3c736d32565c30d857 x265_1.8.tar.gz
diff --git a/package/x265/x265.mk b/package/x265/x265.mk
new file mode 100644
index 0000000..5b34eb4
--- /dev/null
+++ b/package/x265/x265.mk
@@ -0,0 +1,31 @@
+################################################################################
+#
+# x265
+#
+################################################################################
+
+X265_VERSION = 1.8
+X265_SOURCE = x265_$(X265_VERSION).tar.gz
+X265_SITE = https://bitbucket.org/multicoreware/x265/downloads
+X265_LICENSE = GPLv2+
+X265_LICENSE_FILES = COPYING
+X265_SUBDIR = source/
+X265_INSTALL_STAGING = YES
+
+ifeq ($(BR2_i386)$(BR2_x86_64),y)
+X265_DEPENDENCIES += host-yasm
+endif
+
+ifeq ($(BR2_SHARED_LIBS)$(BR2_SHARED_STATIC_LIBS),y)
+X265_CONF_OPTS += -DENABLE_SHARED=true -DENABLE_PIC=true
+else
+X265_CONF_OPTS += -DENABLE_SHARED=false
+endif
+
+ifeq ($(BR2_PACKAGE_X265_CLI),)
+X265_CONF_OPTS += -DENABLE_CLI=false
+else
+X265_CONF_OPTS += -DENABLE_CLI=true
+endif
+
+$(eval $(cmake-package))
--
2.1.0
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [Buildroot] [PATCH 2/2] gst1-plugins-bad: add x265 plugin
2015-10-24 19:50 [Buildroot] [PATCH 1/2] x265: new package Thijs Vermeir
@ 2015-10-24 19:50 ` Thijs Vermeir
2015-10-25 21:30 ` Peter Korsgaard
2015-10-25 21:29 ` [Buildroot] [PATCH 1/2] x265: new package Peter Korsgaard
1 sibling, 1 reply; 8+ messages in thread
From: Thijs Vermeir @ 2015-10-24 19:50 UTC (permalink / raw)
To: buildroot
Signed-off-by: Thijs Vermeir <thijsvermeir@gmail.com>
---
package/gstreamer1/gst1-plugins-bad/Config.in | 7 ++++++-
package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk | 2 ++
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/package/gstreamer1/gst1-plugins-bad/Config.in b/package/gstreamer1/gst1-plugins-bad/Config.in
index a28243b..26a963e 100644
--- a/package/gstreamer1/gst1-plugins-bad/Config.in
+++ b/package/gstreamer1/gst1-plugins-bad/Config.in
@@ -635,7 +635,12 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_HLS
config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_X265
bool "x265"
+ depends on BR2_INSTALL_LIBSTDCPP
+ select BR2_PACKAGE_X265
help
- x265 plugin
+ x265 encoding plugin
+
+comment "x265 needs a toolchain w/ C++"
+ depends on !BR2_INSTALL_LIBSTDCPP
endif
diff --git a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk
index fe5f242..1c42a60 100644
--- a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk
+++ b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk
@@ -760,6 +760,8 @@ endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_X265),y)
GST1_PLUGINS_BAD_CONF_OPTS += --enable-x265
+GST1_PLUGINS_BAD_DEPENDENCIES += x265
+GST1_PLUGINS_BAD_HAS_GPL_LICENSE = y
else
GST1_PLUGINS_BAD_CONF_OPTS += --disable-x265
endif
--
2.1.0
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [Buildroot] [PATCH 1/2] x265: new package
2015-10-24 19:50 [Buildroot] [PATCH 1/2] x265: new package Thijs Vermeir
2015-10-24 19:50 ` [Buildroot] [PATCH 2/2] gst1-plugins-bad: add x265 plugin Thijs Vermeir
@ 2015-10-25 21:29 ` Peter Korsgaard
2015-10-25 21:40 ` Yann E. MORIN
1 sibling, 1 reply; 8+ messages in thread
From: Peter Korsgaard @ 2015-10-25 21:29 UTC (permalink / raw)
To: buildroot
>>>>> "Thijs" == Thijs Vermeir <thijsvermeir@gmail.com> writes:
> x265 is a H.265 / HEVC video encoder application library, designed to encode
> video or images into an H.265 / HEVC encoded bitstream.
> http://x265.org
> Signed-off-by: Thijs Vermeir <thijsvermeir@gmail.com>
> +++ b/package/x265/x265.mk
> @@ -0,0 +1,31 @@
> +################################################################################
> +#
> +# x265
> +#
> +################################################################################
> +
> +X265_VERSION = 1.8
> +X265_SOURCE = x265_$(X265_VERSION).tar.gz
> +X265_SITE = https://bitbucket.org/multicoreware/x265/downloads
> +X265_LICENSE = GPLv2+
> +X265_LICENSE_FILES = COPYING
> +X265_SUBDIR = source/
NIT: we normally don't append the trailing '/'.
> +X265_INSTALL_STAGING = YES
> +
> +ifeq ($(BR2_i386)$(BR2_x86_64),y)
> +X265_DEPENDENCIES += host-yasm
> +endif
> +
> +ifeq ($(BR2_SHARED_LIBS)$(BR2_SHARED_STATIC_LIBS),y)
> +X265_CONF_OPTS += -DENABLE_SHARED=true -DENABLE_PIC=true
> +else
> +X265_CONF_OPTS += -DENABLE_SHARED=false
> +endif
Any idea why the x265 developers don't use the "standard"
BUILD_SHARED_LIBS=ON|OFF flag like other packages?
> +
> +ifeq ($(BR2_PACKAGE_X265_CLI),)
> +X265_CONF_OPTS += -DENABLE_CLI=false
> +else
> +X265_CONF_OPTS += -DENABLE_CLI=true
> +endif
We prefer positive logic, so I've swapped these around.
Committed, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 8+ messages in thread
* [Buildroot] [PATCH 1/2] x265: new package
2015-10-25 21:29 ` [Buildroot] [PATCH 1/2] x265: new package Peter Korsgaard
@ 2015-10-25 21:40 ` Yann E. MORIN
2015-10-26 12:53 ` Thijs Vermeir
0 siblings, 1 reply; 8+ messages in thread
From: Yann E. MORIN @ 2015-10-25 21:40 UTC (permalink / raw)
To: buildroot
\Peter, All,
On 2015-10-25 22:29 +0100, Peter Korsgaard spake thusly:
> >>>>> "Thijs" == Thijs Vermeir <thijsvermeir@gmail.com> writes:
> > x265 is a H.265 / HEVC video encoder application library, designed to encode
> > video or images into an H.265 / HEVC encoded bitstream.
>
> > http://x265.org
>
> > Signed-off-by: Thijs Vermeir <thijsvermeir@gmail.com>
>
> > +++ b/package/x265/x265.mk
> > @@ -0,0 +1,31 @@
> > +################################################################################
> > +#
> > +# x265
> > +#
> > +################################################################################
> > +
> > +X265_VERSION = 1.8
> > +X265_SOURCE = x265_$(X265_VERSION).tar.gz
> > +X265_SITE = https://bitbucket.org/multicoreware/x265/downloads
> > +X265_LICENSE = GPLv2+
> > +X265_LICENSE_FILES = COPYING
> > +X265_SUBDIR = source/
>
> NIT: we normally don't append the trailing '/'.
>
> > +X265_INSTALL_STAGING = YES
> > +
> > +ifeq ($(BR2_i386)$(BR2_x86_64),y)
> > +X265_DEPENDENCIES += host-yasm
> > +endif
> > +
> > +ifeq ($(BR2_SHARED_LIBS)$(BR2_SHARED_STATIC_LIBS),y)
> > +X265_CONF_OPTS += -DENABLE_SHARED=true -DENABLE_PIC=true
> > +else
> > +X265_CONF_OPTS += -DENABLE_SHARED=false
> > +endif
>
> Any idea why the x265 developers don't use the "standard"
> BUILD_SHARED_LIBS=ON|OFF flag like other packages?
I gues it would work, since they do things like:
if(ENABLE_SHARED)
and
if(ENABLE_PIC)
Ditto for CLI.
Thijs, care to check if changing true/false to ON/OFF still works,
please? If so, can you send an patch? This way, all our Cmake-based
packages will look the same, which is good for consistency.
Regards,
Yann E. MORIN.
> > +ifeq ($(BR2_PACKAGE_X265_CLI),)
> > +X265_CONF_OPTS += -DENABLE_CLI=false
> > +else
> > +X265_CONF_OPTS += -DENABLE_CLI=true
> > +endif
>
> We prefer positive logic, so I've swapped these around.
>
> Committed, thanks.
>
> --
> Bye, Peter Korsgaard
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 8+ messages in thread* [Buildroot] [PATCH 1/2] x265: new package
2015-10-25 21:40 ` Yann E. MORIN
@ 2015-10-26 12:53 ` Thijs Vermeir
2015-10-26 18:00 ` Yann E. MORIN
0 siblings, 1 reply; 8+ messages in thread
From: Thijs Vermeir @ 2015-10-26 12:53 UTC (permalink / raw)
To: buildroot
Hi,
On Sun, Oct 25, 2015 at 10:40 PM, Yann E. MORIN <yann.morin.1998@free.fr> wrote:
> \Peter, All,
>
> On 2015-10-25 22:29 +0100, Peter Korsgaard spake thusly:
>> >>>>> "Thijs" == Thijs Vermeir <thijsvermeir@gmail.com> writes:
>> > x265 is a H.265 / HEVC video encoder application library, designed to encode
>> > video or images into an H.265 / HEVC encoded bitstream.
>>
>> > http://x265.org
>>
>> > Signed-off-by: Thijs Vermeir <thijsvermeir@gmail.com>
>>
>> > +++ b/package/x265/x265.mk
>> > @@ -0,0 +1,31 @@
>> > +################################################################################
>> > +#
>> > +# x265
>> > +#
>> > +################################################################################
>> > +
>> > +X265_VERSION = 1.8
>> > +X265_SOURCE = x265_$(X265_VERSION).tar.gz
>> > +X265_SITE = https://bitbucket.org/multicoreware/x265/downloads
>> > +X265_LICENSE = GPLv2+
>> > +X265_LICENSE_FILES = COPYING
>> > +X265_SUBDIR = source/
>>
>> NIT: we normally don't append the trailing '/'.
>>
>> > +X265_INSTALL_STAGING = YES
>> > +
>> > +ifeq ($(BR2_i386)$(BR2_x86_64),y)
>> > +X265_DEPENDENCIES += host-yasm
>> > +endif
>> > +
>> > +ifeq ($(BR2_SHARED_LIBS)$(BR2_SHARED_STATIC_LIBS),y)
>> > +X265_CONF_OPTS += -DENABLE_SHARED=true -DENABLE_PIC=true
>> > +else
>> > +X265_CONF_OPTS += -DENABLE_SHARED=false
>> > +endif
>>
>> Any idea why the x265 developers don't use the "standard"
>> BUILD_SHARED_LIBS=ON|OFF flag like other packages?
>
> I gues it would work, since they do things like:
>
> if(ENABLE_SHARED)
> and
> if(ENABLE_PIC)
>
> Ditto for CLI.
>
> Thijs, care to check if changing true/false to ON/OFF still works,
> please? If so, can you send an patch? This way, all our Cmake-based
> packages will look the same, which is good for consistency.
>
> Regards,
> Yann E. MORIN.
Yes, I can look at it. To be clear you mean by the "standard" way:
- create a patch to accept BUILD_SHARED_LIBS (and enable fPIC) and
remove all the shared lib stuff from the mk file
- and change values in the mk file for the CLI option from true/false -> ON/OFF
Gr,
Thijs
>
>> > +ifeq ($(BR2_PACKAGE_X265_CLI),)
>> > +X265_CONF_OPTS += -DENABLE_CLI=false
>> > +else
>> > +X265_CONF_OPTS += -DENABLE_CLI=true
>> > +endif
>>
>> We prefer positive logic, so I've swapped these around.
>>
>> Committed, thanks.
>>
>> --
>> Bye, Peter Korsgaard
>> _______________________________________________
>> buildroot mailing list
>> buildroot at busybox.net
>> http://lists.busybox.net/mailman/listinfo/buildroot
>
> --
> .-----------------.--------------------.------------------.--------------------.
> | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
> | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
> | +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
> | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
> '------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 8+ messages in thread
* [Buildroot] [PATCH 1/2] x265: new package
2015-10-26 12:53 ` Thijs Vermeir
@ 2015-10-26 18:00 ` Yann E. MORIN
2015-10-26 20:18 ` Thijs Vermeir
0 siblings, 1 reply; 8+ messages in thread
From: Yann E. MORIN @ 2015-10-26 18:00 UTC (permalink / raw)
To: buildroot
Thijs, All,
On 2015-10-26 13:53 +0100, Thijs Vermeir spake thusly:
> On Sun, Oct 25, 2015 at 10:40 PM, Yann E. MORIN <yann.morin.1998@free.fr> wrote:
[--SNIP--]
> > Thijs, care to check if changing true/false to ON/OFF still works,
> > please? If so, can you send an patch? This way, all our Cmake-based
> > packages will look the same, which is good for consistency.
> >
> > Regards,
> > Yann E. MORIN.
>
> Yes, I can look at it. To be clear you mean by the "standard" way:
> - create a patch to accept BUILD_SHARED_LIBS (and enable fPIC) and
> remove all the shared lib stuff from the mk file
No, it should not be needed to patch the sources of the package.
Just check if changing true/false in x265.mk to ON/OFF still works. If
so, do the change and send a patch to Buildroot to use ON/OFF instead of
true/false.
If it does not work, we will keep true/false.
Regards,
Yann E. MORIN.
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 8+ messages in thread
* [Buildroot] [PATCH 1/2] x265: new package
2015-10-26 18:00 ` Yann E. MORIN
@ 2015-10-26 20:18 ` Thijs Vermeir
0 siblings, 0 replies; 8+ messages in thread
From: Thijs Vermeir @ 2015-10-26 20:18 UTC (permalink / raw)
To: buildroot
Hi,
On Mon, Oct 26, 2015 at 7:00 PM, Yann E. MORIN <yann.morin.1998@free.fr> wrote:
> Thijs, All,
>
> On 2015-10-26 13:53 +0100, Thijs Vermeir spake thusly:
>> On Sun, Oct 25, 2015 at 10:40 PM, Yann E. MORIN <yann.morin.1998@free.fr> wrote:
> ...
>
> No, it should not be needed to patch the sources of the package.
>
> Just check if changing true/false in x265.mk to ON/OFF still works. If
> so, do the change and send a patch to Buildroot to use ON/OFF instead of
> true/false.
>
> If it does not work, we will keep true/false.
Works like a charm!
Gr,
Thijs
>
> Regards,
> Yann E. MORIN.
>
> --
> .-----------------.--------------------.------------------.--------------------.
> | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
> | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
> | +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
> | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
> '------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2015-10-26 20:18 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-10-24 19:50 [Buildroot] [PATCH 1/2] x265: new package Thijs Vermeir
2015-10-24 19:50 ` [Buildroot] [PATCH 2/2] gst1-plugins-bad: add x265 plugin Thijs Vermeir
2015-10-25 21:30 ` Peter Korsgaard
2015-10-25 21:29 ` [Buildroot] [PATCH 1/2] x265: new package Peter Korsgaard
2015-10-25 21:40 ` Yann E. MORIN
2015-10-26 12:53 ` Thijs Vermeir
2015-10-26 18:00 ` Yann E. MORIN
2015-10-26 20:18 ` Thijs Vermeir
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox