tstools: GitHub migration

PATCH New Vicente Olivert Riera 2 participants 3 messages Oct 20, 2015

lore

Share & tools

lore

Vicente Olivert Riera

author

2015-10-20 13:06 UTC #0 lore raw

PATCH 1/1 tstools: GitHub migration

tstools has migrated to GitHub, so let's use this opportuninty to rework this package as well.

- Change site to GitHub.
- No releases of tags yet, so let's use the latest commit ID from the master branch as a version.
- There is currently no license attributed to tstools, so state that in the tstools.mk file and add empty license variables. This issue is being tracked upstream: https://github.com/kynesim/tstools/issues/32
- Wrap the help text in the Config.in to 72 characters, and also change the project URL to the GitHub one.
- Add a hash file.
- Rename the patch to use a four digit numbering (001 -> 0001).

Signed-off-by Vicente Olivert Riera <[email protected]>

---
 ...h => 0001-build-get-along-with-buildroot.patch} |    0
 package/tstools/Config.in                          |   19 +++++++++----------
 package/tstools/tstools.hash                       |    2 ++
 package/tstools/tstools.mk                         |   11 +++++++----
 4 files changed, 18 insertions(+), 14 deletions(-)
 rename package/tstools/{001-build-get-along-with-buildroot.patch => 0001-build-get-along-with-buildroot.patch} (100%)
 create mode 100644 package/tstools/tstools.hash

package/tstools/0001-build-get-along-with-buildroot.patch renamed from package/tstools/001-build-get-along-with-buildroot.patch +0 -0

similarity index 100%
rename from package/tstools/001-build-get-along-with-buildroot.patch
rename to package/tstools/0001-build-get-along-with-buildroot.patch

package/tstools/Config.in +9 ~~-10~~

index 706cb54..f5dd138 100644
@@ -2,16 +2,15 @@ config BR2_PACKAGE_TSTOOLS
 	bool "tstools"
 	depends on BR2_USE_MMU # fork()
 	help
-	  This is a set of cross-platform command line tools for
-	  working with MPEG data
+	  This is a set of cross-platform command line tools for working with
+	  MPEG data.
 
-	  The emphasis is on relatively simple tools which concentrate
-	  on MPEG (H.264 and H.262) data packaged according to H.222
-	  (i.e., TS or PS), with a particular interest in checking for
-	  conformance.
+	  The emphasis is on relatively simple tools which concentrate on MPEG
+	  (H.264 and H.262) data packaged according to H.222 (i.e., TS or PS),
+	  with a particular interest in checking for conformance.
 
-	  Transport Stream (TS) is typically used for distribution of
-	  cable and satellite data. Program Stream (PS) is typically
-	  used to store data on DVDs.
+	  Transport Stream (TS) is typically used for distribution of cable
+	  and satellite data. Program Stream (PS) is typically used to store
+	  data on DVDs.
 
-	  https://code.google.com/p/tstools/
+	  https://github.com/kynesim/tstools/

package/tstools/tstools.hash new file +2 -0

new file mode 100644
index 0000000..9b0f1c7
@@ -0,0 +1,2 @@
+# Locally calculated
+sha256 3d2b2375e2874933f9aa59d4f25bb6b334747219eb0d7a076974e61222d59bf6  tstools-08f6be304040e7b84760ac3920bcff4a563b6cd2.tar.gz

package/tstools/tstools.mk +7 -4

index 40920d2..70c55fd 100644
@@ -4,10 +4,13 @@
 #
 ################################################################################
 
-TSTOOLS_VERSION = 1_11
-TSTOOLS_SITE = https://tstools.googlecode.com/files
-TSTOOLS_SOURCE = tstools-$(TSTOOLS_VERSION).tgz
-TSTOOLS_LICENSE = MPL v1.1
+# No releases or tags yet. Use the latest commit ID from master branch.
+TSTOOLS_VERSION = 08f6be304040e7b84760ac3920bcff4a563b6cd2
+TSTOOLS_SITE = $(call github,kynesim,tstools,$(TSTOOLS_VERSION))
+# tstools doesn't have any license so far. See:
+# https://github.com/kynesim/tstools/issues/32
+TSTOOLS_LICENSE =
+TSTOOLS_LICENSE_FILES =
 
 define TSTOOLS_BUILD_CMDS
 	$(TARGET_CONFIGURE_OPTS) LD="$(TARGET_CC)" $(TARGET_MAKE_ENV) \

Signature · 1 line

1.7.1

Peter Korsgaard

2015-10-20 14:32 UTC #1 lore raw

PATCH 1/1 tstools: GitHub migration

Quoted 24 lines

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Vicente" == Vicente Olivert Riera <[email protected]> writes:
tstools has migrated to GitHub, so let's use this opportuninty to rework this package as well.
- Change site to GitHub.
- No releases of tags yet, so let's use the latest commit ID from the master branch as a version.
- There is currently no license attributed to tstools, so state that in the tstools.mk file and add empty license variables. This issue is being tracked upstream: https://github.com/kynesim/tstools/issues/32
- Wrap the help text in the Config.in to 72 characters, and also change the project URL to the GitHub one.
- Add a hash file.
- Rename the patch to use a four digit numbering (001 -> 0001).
Signed-off-by Vicente Olivert Riera <[email protected]>
+++ b/package/tstools/tstools.mk
package/tstools/tstools.mk +0 -1
@@ -4,10 +4,13 @@
 #
 ################################################################################
 
-TSTOOLS_VERSION = 1_11

package/tstools/tstools.mk line 13

Quoted 10 lines

package/tstools/tstools.mk +7 -3

-TSTOOLS_SITE = https://tstools.googlecode.com/files
-TSTOOLS_SOURCE = tstools-$(TSTOOLS_VERSION).tgz
-TSTOOLS_LICENSE = MPL v1.1
+# No releases or tags yet. Use the latest commit ID from master branch.
+TSTOOLS_VERSION = 08f6be304040e7b84760ac3920bcff4a563b6cd2
+TSTOOLS_SITE = $(call github,kynesim,tstools,$(TSTOOLS_VERSION))
+# tstools doesn't have any license so far. See:
+# https://github.com/kynesim/tstools/issues/32
+TSTOOLS_LICENSE =
+TSTOOLS_LICENSE_FILES =

While it is correct that the upstream repo doesn't include a copy of the license file, plenty (all?) source files clearly list that they are under the MPL v1.1 license:

grep -rls 'MPL v1.1'
tsplay_fns.h
ipv4.h
pcap.h
psdots.c
ipv4.c
ts_fns.h
reverse.c
compat.h
m2ts2ts.c
avs_fns.h
fmtx.c
pes_fns.h
fmtx.h
ts2es.c
nalunit.c
tswrite_defns.h
python/Setup.py
python/Makefile
python/tstools/cwrapper.pxd
python/tstools/tstools.pyx
python/tstools/__init__.py
python/tstools/common.pxd
nalunit_fns.h
es_defns.h
bitdata.c
ethernet.c
reverse_defns.h
adts.c
accessunit_fns.h
test_printing.c
ts.c
adts_defns.h
esreverse.c
esdots.c
sockread.py
esreport.c
test_pes.c
tsplay.c
ps2ts.c
stream_type.c
filter_fns.h
Makefile.w32
bitdata_fns.h
misc_defns.h
printing.c
pidint_fns.h
rtp2264.c
avs_defns.h
ts_defns.h
es_fns.h
bitdata_defns.h
ethernet.h
ps_fns.h
ps.c
accessunit.c
audio.c
misc_fns.h
h222_defns.h
test_es_unit_list.c
pes_defns.h
socktest.py
Makefile
pes.c
yuv2/src/com/aminocom/yuv2/MainFrame.java
yuv2/src/com/aminocom/yuv2/Prefs.java
yuv2/src/com/aminocom/yuv2/AboutBox.java
yuv2/src/com/aminocom/yuv2/YUV2.java
yuv2/src/com/aminocom/yuv2/FormatDialog.java
yuv2/src/com/aminocom/yuv2/Utils.java
yuv2/src/com/aminocom/yuv2/BufferedImage.java
yuv2/src/com/aminocom/yuv2/LogWindow.java
yuv2/src/com/aminocom/yuv2/ImageCanvas.java
tsserve.c
docs/ac3.txt
docs/adts.txt
docs/get_next_access_unit.py
docs/todo.txt
docs/build_html.py
docs/library.txt
docs/index.txt
docs/tools.txt
docs/get_next_access_unit.py.html
h222.c
h262_fns.h
tsreport.c
nalunit_defns.h
tswrite_fns.h
audio_defns.h
tsinfo.c
ps_defns.h
printing_defns.h
pidint.c
audio_fns.h
tsfilter.c
filter_defns.h
psreport.c
version.h
pcap.c
ac3.c
pcapreport.c
ts_packet_insert.c
reverse_fns.h
ac3_fns.h
avs.c
h262.c
ts2ps.c
tsplay_innards.c
l2audio_fns.h
adts_fns.h
es2ts.c
video_defns.h
h262_defns.h
misc.c
esfilter.c
accessunit_defns.h
h222_fns.h
esmerge.c
pidint_defns.h
tsdvbsub.c
filter.c
tsplay_defns.h
es.c
printing_fns.h
test_nal_unit_list.c
tswrite.c
l2audio.c

So I've kept the license as MPLv1.1 and adjusted the comment to make it clear that it is just the license file we are missing.

Committed with that fixed, thanks.

Signature · 1 line

Bye, Peter Korsgaard

Vicente Olivert Riera

author

2015-10-20 14:40 UTC #2 lore raw

PATCH 1/1 tstools: GitHub migration

On 10/20/2015 03:32 PM, Peter Korsgaard wrote:
[snip]

Quoted 12 lines

package/tstools/tstools.mk line 13
Quoted 4 lines
package/tstools/tstools.mk +4 -0
+# tstools doesn't have any license so far. See:
+# https://github.com/kynesim/tstools/issues/32
+TSTOOLS_LICENSE =
+TSTOOLS_LICENSE_FILES =
While it is correct that the upstream repo doesn't include a copy of the license file, plenty (all?) source files clearly list that they are under the MPL v1.1 license:
grep -rls 'MPL v1.1'
tsplay_fns.h
ipv4.h

...
[snip]

Quoted 2 lines

So I've kept the license as MPLv1.1 and adjusted the comment to make it clear that it is just the license file we are missing.

Ooops, I see. Thanks Peter!

Quoted 2 lines

Committed with that fixed, thanks.