Message ID | 201509201015.t8KAFEK0027976@ms-omx02.plus.so-net.ne.jp |
---|---|
State | Superseded |
Headers | show |
Dear Hiroshi Kawashima, thanks for taking my comments into account and fix all the issue we find during the review process. This patch looks good to me, but it has a big issue. You have edited it manually and forgot to change one important thing. Please keep reading. On 20/09/15 11:15, kei-k@ca2.so-net.ne.jp wrote: > Signed-off-by: Hiroshi Kawashima <kei-k@ca2.so-net.ne.jp> > --- > package/Config.in | 5 +---- > package/squeezelite/Config.in | 33 +++++++++++++++++++++++++++++++++ Here you have changed a 32 by a 33, and added one more +. Please keep scrolling down. > package/squeezelite/squeezelite.mk | 30 ++++++++++++++++++++++++++++++ > 3 files changed, 63 insertions(+), 4 deletions(-) > create mode 100644 package/squeezelite/Config.in > create mode 100644 package/squeezelite/squeezelite.mk > > diff --git a/package/Config.in b/package/Config.in > index 22aef52..57f4498 100644 > --- a/package/Config.in > +++ b/package/Config.in > @@ -33,6 +33,7 @@ menu "Audio and video applications" > source "package/opus-tools/Config.in" > source "package/pulseaudio/Config.in" > source "package/sox/Config.in" > + source "package/squeezelite/Config.in" > source "package/tidsp-binaries/Config.in" > source "package/tovid/Config.in" > source "package/tstools/Config.in" > diff --git a/package/squeezelite/Config.in b/package/squeezelite/Config.in > new file mode 100644 > index 0000000..c27dac2 > --- /dev/null > +++ b/package/squeezelite/Config.in > @@ -0,0 +1,32 @@ But you forgot to change this 32 here and put 33, so when we apply your patch only 32 lines are written to package/squeezelite/Config.in. Please, _NEVER_ edit patches manually. Always regenerate them using "git format-patch". In fact, I don't know why are you generating the patch file (since you are not adding a changelog) and then sending it by email. You can just send by email your latest commit with "git send-email --to=buildroot@buildroot.org --subject-prefix="PATCHv6" -1". When we find issues during the review, you have to fix the issues by editing the needed files. Then add those files again with "git add <the file>", and then amend your commit with "git commit --amend". That workflow is much easier and faster. Regards, Vincent. [snip]
Thank you for taking time to review. Ok, I will post sanity patch again. Kawashima > 2015/09/20 20:00、Vincent Olivert Riera <Vincent.Riera@imgtec.com> のメール: > > Dear Hiroshi Kawashima, > > thanks for taking my comments into account and fix all the issue we find during the review process. > > This patch looks good to me, but it has a big issue. You have edited it manually and forgot to change one important thing. Please keep reading. > > On 20/09/15 11:15, kei-k@ca2.so-net.ne.jp wrote: >> Signed-off-by: Hiroshi Kawashima <kei-k@ca2.so-net.ne.jp> >> --- >> package/Config.in | 5 +---- >> package/squeezelite/Config.in | 33 +++++++++++++++++++++++++++++++++ > > Here you have changed a 32 by a 33, and added one more +. Please keep scrolling down. > >> package/squeezelite/squeezelite.mk | 30 ++++++++++++++++++++++++++++++ >> 3 files changed, 63 insertions(+), 4 deletions(-) >> create mode 100644 package/squeezelite/Config.in >> create mode 100644 package/squeezelite/squeezelite.mk >> >> diff --git a/package/Config.in b/package/Config.in >> index 22aef52..57f4498 100644 >> --- a/package/Config.in >> +++ b/package/Config.in >> @@ -33,6 +33,7 @@ menu "Audio and video applications" >> source "package/opus-tools/Config.in" >> source "package/pulseaudio/Config.in" >> source "package/sox/Config.in" >> + source "package/squeezelite/Config.in" >> source "package/tidsp-binaries/Config.in" >> source "package/tovid/Config.in" >> source "package/tstools/Config.in" >> diff --git a/package/squeezelite/Config.in b/package/squeezelite/Config.in >> new file mode 100644 >> index 0000000..c27dac2 >> --- /dev/null >> +++ b/package/squeezelite/Config.in >> @@ -0,0 +1,32 @@ > > But you forgot to change this 32 here and put 33, so when we apply your patch only 32 lines are written to package/squeezelite/Config.in. > > Please, _NEVER_ edit patches manually. Always regenerate them using "git format-patch". > > In fact, I don't know why are you generating the patch file (since you are not adding a changelog) and then sending it by email. You can just send by email your latest commit with "git send-email --to=buildroot@buildroot.org --subject-prefix="PATCHv6" -1". > > When we find issues during the review, you have to fix the issues by editing the needed files. Then add those files again with "git add <the file>", and then amend your commit with "git commit --amend". That workflow is much easier and faster. > > Regards, > > Vincent. > > [snip]
diff --git a/package/Config.in b/package/Config.in index 22aef52..57f4498 100644 --- a/package/Config.in +++ b/package/Config.in @@ -33,6 +33,7 @@ menu "Audio and video applications" source "package/opus-tools/Config.in" source "package/pulseaudio/Config.in" source "package/sox/Config.in" + source "package/squeezelite/Config.in" source "package/tidsp-binaries/Config.in" source "package/tovid/Config.in" source "package/tstools/Config.in" diff --git a/package/squeezelite/Config.in b/package/squeezelite/Config.in new file mode 100644 index 0000000..c27dac2 --- /dev/null +++ b/package/squeezelite/Config.in @@ -0,0 +1,32 @@ +config BR2_PACKAGE_SQUEEZELITE + bool "squeezelite" + depends on BR2_USE_WCHAR # flac + depends on BR2_TOOLCHAIN_HAS_THREADS # alsa-lib + depends on BR2_USE_MMU # mpg123 + select BR2_PACKAGE_ALSA_LIB + select BR2_PACKAGE_FLAC + select BR2_PACKAGE_LIBMAD + select BR2_PACKAGE_LIBVORBIS + select BR2_PACKAGE_FAAD2 + select BR2_PACKAGE_MPG123 + select BR2_PACKAGE_LIBSOXR + help + Logitech Media Server client + https://code.google.com/p/squeezelite/ + +config BR2_PACKAGE_SQUEEZELITE_ENABLE_RESAMPLE + bool "Enable resampling function" + default y + depends on BR2_PACKAGE_SQUEEZELITE + help + Enable resampling function + +config BR2_PACKAGE_SQUEEZELITE_WITH_RESAMPLE_MP + bool "Use OpenMP for resampling" + default y + depends on BR2_PACKAGE_SQUEEZELITE_ENABLE_RESAMPLE + help + Enable OpenMP support for resampling + +comment "squeezelite needs a toolchain w/ wchar, threads" + depends BR2_USE_MMU + depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/squeezelite/squeezelite.mk b/package/squeezelite/squeezelite.mk new file mode 100644 index 0000000..681bb46 --- /dev/null +++ b/package/squeezelite/squeezelite.mk @@ -0,0 +1,30 @@ +################################################################################ +# +# squeezelite +# +################################################################################ + +SQUEEZELITE_VERSION = v1.8 +SQUEEZELITE_SITE = https://code.google.com/p/squeezelite +SQUEEZELITE_SITE_METHOD = git +SQUEEZELITE_LICENSE = GPLv3 +SQUEEZELITE_LICENSE_FILE = LICENSE.txt +SQUEEZELITE_DEPENDENCIES = alsa-lib flac libmad libvorbis faad2 mpg123 libsoxr + +ifeq ($(BR2_PACKAGE_SQUEEZELITE_ENABLE_RESAMPLE),y) + SQUEEZELITE_MAKE_OPTS += -DRESAMPLE + ifeq ($(BR2_PACKAGE_SQUEEZELITE_WITH_RESAMPLE_MP),y) + SQUEEZELITE_MAKE_OPTS += -DRESAMPLE_MP + endif +endif + +define SQUEEZELITE_BUILD_CMDS + $(TARGET_MAKE_ENV) $(MAKE) OPTS="$(SQUEEZELITE_MAKE_OPTS)" \ + CC="$(TARGET_CC)" LD="$(TARGET_LD)" -C $(@D) all +endef + +define SQUEEZELITE_INSTALL_TARGET_CMDS + $(INSTALL) -D -m 0755 $(@D)/squeezelite $(TARGET_DIR)/usr/bin +endef + +$(eval $(generic-package))
Signed-off-by: Hiroshi Kawashima <kei-k@ca2.so-net.ne.jp> --- package/Config.in | 5 +---- package/squeezelite/Config.in | 33 +++++++++++++++++++++++++++++++++ package/squeezelite/squeezelite.mk | 30 ++++++++++++++++++++++++++++++ 3 files changed, 63 insertions(+), 4 deletions(-) create mode 100644 package/squeezelite/Config.in create mode 100644 package/squeezelite/squeezelite.mk