rules/vlc/default: Fixed compilation errors by updating version and disabling missing dependencies.

rules/x264/default: Added missing configuration options.
rules/vlc/default: Target compiler was not being found.
2017-01-14 15:19:34 +00:00 · 2017-01-14 15:19:34 +00:00 · 2017-01-14 15:19:34 +00:00 · 2017-01-14 15:19:34 +00:00
23 changed files with 37 additions and 2749 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -10,4 +10,3 @@
 /lauv-aux-rpi
 /ntnu-b2xx
 /stamp9g20
-/lctr-rpi
--- a/functions.bash
+++ b/functions.bash
@@ -1,6 +1,6 @@
 ###########################################################################
 # GLUED: GNU/Linux Uniform Environment Distribution                       #
-# Copyright (C) 2007-2017 Universidade do Porto - Faculdade de Engenharia #
+# Copyright (C) 2007-2014 Universidade do Porto - Faculdade de Engenharia #
 # Laboratório de Sistemas e Tecnologia Subaquática (LSTS)                 #
 ###########################################################################
 # This program is free software; you can redistribute it and/or modify    #
--- a/mkconfig.bash
+++ b/mkconfig.bash
@@ -1,7 +1,7 @@
 #! /bin/bash
 ###########################################################################
 # GLUED: GNU/Linux Uniform Environment Distribution                       #
-# Copyright (C) 2007-2017 Universidade do Porto - Faculdade de Engenharia #
+# Copyright (C) 2007-2014 Universidade do Porto - Faculdade de Engenharia #
 # Laboratório de Sistemas e Tecnologia Subaquática (LSTS)                 #
 ###########################################################################
 # This program is free software; you can redistribute it and/or modify    #
--- a/mkdisk.bash
+++ b/mkdisk.bash
@@ -1,7 +1,7 @@
 #! /bin/bash
 ###########################################################################
 # GLUED: GNU/Linux Uniform Environment Distribution                       #
-# Copyright (C) 2007-2017 Universidade do Porto - Faculdade de Engenharia #
+# Copyright (C) 2007-2014 Universidade do Porto - Faculdade de Engenharia #
 # Laboratório de Sistemas e Tecnologia Subaquática (LSTS)                 #
 ###########################################################################
 # This program is free software; you can redistribute it and/or modify    #
--- a/mkpackage.bash
+++ b/mkpackage.bash
@@ -1,7 +1,7 @@
 #! /bin/bash
 ###########################################################################
 # GLUED: GNU/Linux Uniform Environment Distribution                       #
-# Copyright (C) 2007-2017 Universidade do Porto - Faculdade de Engenharia #
+# Copyright (C) 2007-2014 Universidade do Porto - Faculdade de Engenharia #
 # Laboratório de Sistemas e Tecnologia Subaquática (LSTS)                 #
 ###########################################################################
 # This program is free software; you can redistribute it and/or modify    #
--- a/mksystem.bash
+++ b/mksystem.bash
@@ -1,7 +1,7 @@
 #! /bin/bash
 ###########################################################################
 # GLUED: GNU/Linux Uniform Environment Distribution                       #
-# Copyright (C) 2007-2017 Universidade do Porto - Faculdade de Engenharia #
+# Copyright (C) 2007-2013 Universidade do Porto - Faculdade de Engenharia #
 # Laboratório de Sistemas e Tecnologia Subaquática (LSTS)                 #
 ###########################################################################
 # This program is free software; you can redistribute it and/or modify    #
--- a/pkrootfs.bash
+++ b/pkrootfs.bash
@@ -1,7 +1,7 @@
 #! /bin/bash
 ###########################################################################
 # GLUED: GNU/Linux Uniform Environment Distribution                       #
-# Copyright (C) 2007-2017 Universidade do Porto - Faculdade de Engenharia #
+# Copyright (C) 2007-2014 Universidade do Porto - Faculdade de Engenharia #
 # Laboratório de Sistemas e Tecnologia Subaquática (LSTS)                 #
 ###########################################################################
 # This program is free software; you can redistribute it and/or modify    #
--- a/pktoolchain.bash
+++ b/pktoolchain.bash
@@ -1,7 +1,7 @@
 #! /bin/bash
 ###########################################################################
 # GLUED: GNU/Linux Uniform Environment Distribution                       #
-# Copyright (C) 2007-2017 Universidade do Porto - Faculdade de Engenharia #
+# Copyright (C) 2007-2014 Universidade do Porto - Faculdade de Engenharia #
 # Laboratório de Sistemas e Tecnologia Subaquática (LSTS)                 #
 ###########################################################################
 # This program is free software; you can redistribute it and/or modify    #
--- a/rules/vlc/default.bash
+++ b/rules/vlc/default.bash
@@ -2,7 +2,7 @@

 version=\
 (
-    "1.0.6"
+    "1.1.13"
 )

 url=\
@@ -12,22 +12,28 @@ url=\

 md5=\
 (
-    "246a3865ec037f8f5757ef6b973a80fc"
+    "9678fb7a04808b6e0de63746d35e4bb1"
+)
+
+maintainer=\
+(
+    '?'
+    'Tiago Marques <tsmarques@fe.up.pt>'
 )

 requires=\
 (
    'x264/default'
-    #  'ffmpeg/default'
 )

 configure()
 {
+    ./bootstrap
    ./configure \
        --prefix="${cfg_dir_toolchain_sysroot}/usr" \
        --build="$cfg_host_canonical"    \
        --host="$cfg_target_canonical"   \
-        --enable-run-as-root             \
+	--enable-run-as-root             \
        --disable-dbus-control           \
        --disable-dbus                   \
        --disable-hal                    \
@@ -42,7 +48,20 @@ configure()
        --disable-skins2                 \
        --disable-lua                    \
        --disable-x11                    \
-        --disable-glx
+        --disable-glx                    \
+	--disable-bonjour                \
+	--disable-upnp                   \
+	--disable-udev                   \
+	--disable-mtp                    \
+	--disable-libgcrypt              \
+	--disable-remoteosd              \
+	CC="$cmd_target_cc"              \
+	enable_xcb="no"                  \
+	enable_goom="no"                 \
+	enable_projectm="no"             \
+	enable_alsa="no"                 \
+	enable_portaudio="no"            \
+	enable_v4l2="no"
 }

 build()
--- a/rules/x264/default.bash
+++ b/rules/x264/default.bash
@@ -19,7 +19,8 @@ configure()
    --sysroot="${cfg_dir_toolchain_sysroot}" \
    --cross-prefix="${cmd_target_prefix}"    \
    --host="$cfg_target_canonical"           \
-    --prefix="${cfg_dir_toolchain_sysroot}/usr"
+    --prefix="${cfg_dir_toolchain_sysroot}/usr" \
+    --disable-asm
 }

 build()
--- a/systems/lauv-aux-rpi/lauv-arpao-aux.cfg
+++ b/systems/lauv-aux-rpi/lauv-arpao-aux.cfg
@@ -1,2 +0,0 @@
-cfg_hostname='lauv-arpao-aux'
-cfg_eth_ext_ip='10.0.10.63'
--- a/systems/lctr-a6xx/cfg/linux-3.14.63.cfg
+++ b/systems/lctr-a6xx/cfg/linux-3.14.63.cfg
@@ -136,7 +136,7 @@ CONFIG_HAVE_PCSPKR_PLATFORM=y
 CONFIG_EXPERT=y
 # CONFIG_UID16 is not set
 # CONFIG_SYSCTL_SYSCALL is not set
-CONFIG_KALLSYMS=y
+# CONFIG_KALLSYMS is not set
 CONFIG_PRINTK=y
 CONFIG_BUG=y
 CONFIG_ELF_CORE=y
@@ -1900,7 +1900,7 @@ CONFIG_DEFAULT_MESSAGE_LOGLEVEL=4
 #
 # Compile-time checks and compiler options
 #
-CONFIG_DEBUG_INFO=y
+# CONFIG_DEBUG_INFO is not set
 # CONFIG_ENABLE_WARN_DEPRECATED is not set
 # CONFIG_ENABLE_MUST_CHECK is not set
 CONFIG_FRAME_WARN=2048
--- a/systems/lctr-a6xx/lauv-arpao.cfg
+++ b/systems/lctr-a6xx/lauv-arpao.cfg
@@ -1,2 +0,0 @@
-cfg_hostname='lauv-arpao'
-cfg_eth_ext_ip='10.0.10.60'
--- a/systems/lctr-a6xx/lauv-xplore-1.cfg
+++ b/systems/lctr-a6xx/lauv-xplore-1.cfg
@@ -1,3 +1,2 @@
 cfg_hostname='lauv-xplore-1'
 cfg_eth_ext_ip='10.0.10.120'
-cfg_modules="$cfg_modules ftdi_sio"
--- a/systems/lctr-b2xx/echobox.cfg
+++ b/systems/lctr-b2xx/echobox.cfg
@@ -1,6 +0,0 @@
-cfg_hostname='echobox'
-cfg_storage='data0:ext4:/opt'
-cfg_eth_ext_ip='10.0.200.41'
-cfg_eth_ext_mk='255.255.0.0'
-cfg_eth_ext_gw='10.0.0.1'
-cfg_packages='u-boot dropbear rsync busybox e2fsprogs ptpd i2c-tools am33xx-cm3/host linux'
--- a/systems/lctr-b2xx/patches/linux/3.14.63/01-lctr-b2xx-dts.patch
+++ b/systems/lctr-b2xx/patches/linux/3.14.63/01-lctr-b2xx-dts.patch
@@ -1,31 +0,0 @@
-diff -Nru linux-3.14.63/arch/arm/boot/dts/am335x-lctr-b2xx.dts linux-3.14.63.mc/arch/arm/boot/dts/am335x-lctr-b2xx.dts
--- linux-3.14.63/arch/arm/boot/dts/am335x-lctr-b2xx.dts	2017-01-17 14:12:07.019022866 +0000
-+++ linux-3.14.63.mc/arch/arm/boot/dts/am335x-lctr-b2xx.dts	2017-01-17 14:26:45.657383756 +0000
-@@ -60,6 +60,16 @@
- 			0x154 (PIN_OUTPUT_PULLDOWN | MUX_MODE1)
- 		>;
- 	};
-+
-+	/* UART4. */
-+	uart4_pins: pinmux_uart4_pins {
-+		pinctrl-single,pins = <
-+			/* uart4_rxd */
-+			0x70 (PIN_INPUT_PULLUP | MUX_MODE6)
-+			/* uart4_txd */
-+			0x74 (PIN_OUTPUT_PULLDOWN | MUX_MODE6)
-+		>;
-+	};
- };
- 
- /* Enable UART1. */
-@@ -75,3 +85,10 @@
- 	pinctrl-0 = <&uart2_pins>;
- 	status = "okay";
- };
-+
-+/* Enable UART4. */
-+&uart4 {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&uart4_pins>;
-+	status = "okay";
-+};
--- a/systems/lctr-rpi/cfg/linux-3.18_2015-06-03.cfg
+++ b/systems/lctr-rpi/cfg/linux-3.18_2015-06-03.cfg
--- a/systems/lctr-rpi/config
+++ b/systems/lctr-rpi/config
@@ -1,18 +0,0 @@
-cfg_architecture='cortex-a8-hardfp'
-cfg_storage='data0:ext4:/opt'
-cfg_modules=''
-cfg_services0='network dropbear storage upgrade syslog ptpd'
-cfg_services2='dune'
-cfg_packages='dropbear rsync busybox e2fsprogs dosfstools ptpd rpcbind rpi-boot-firmware linux/rpi'
-cfg_target_linux_kernel='arch/arm/boot/zImage'
-cfg_target_linux_dtb='arch/arm/boot/dts/bcm2709-rpi-2-b.dtb'
-cfg_ptpd_interface='eth0'
-cfg_eth_ext_mk='255.255.0.0'
-cfg_eth_ext_gw='10.0.0.1'
-cfg_terminal='ttyAMA0'
-cfg_partitions=\
-(
-    rpi-boot boot0  512B    32MiB
-    root     root0  32MiB   544MiB
-    data     data0  544MiB  -1
-)
--- a/systems/lctr-rpi/fs/boot/config.txt
+++ b/systems/lctr-rpi/fs/boot/config.txt
@@ -1 +0,0 @@
-arm_freq=1000
--- a/systems/lctr-rpi/fs/etc/mdev.conf
+++ b/systems/lctr-rpi/fs/etc/mdev.conf
@@ -1,2 +0,0 @@
-ttyAMA0         root:root  660  >terminal
-ttyUSB[0-9]*    root:root  660  */sbin/mdev-ttyusb
--- a/systems/lctr-rpi/nest-1.cfg
+++ b/systems/lctr-rpi/nest-1.cfg
@@ -1,4 +0,0 @@
-cfg_hostname='nest-1'
-cfg_eth_ext_ip='10.0.200.40'
-cfg_packages="$cfg_packages ppp iptables"
-
--- a/utils/glued-check-sources.bash
+++ b/utils/glued-check-sources.bash
@@ -1,7 +1,7 @@
 #! /bin/bash
 ###########################################################################
 # GLUED: GNU/Linux Uniform Environment Distribution                       #
-# Copyright (C) 2007-2017 Universidade do Porto - Faculdade de Engenharia #
+# Copyright (C) 2007-2015 Universidade do Porto - Faculdade de Engenharia #
 # Laboratório de Sistemas e Tecnologia Subaquática (LSTS)                 #
 ###########################################################################
 # This program is free software; you can redistribute it and/or modify    #
--- a/utils/glued-download-sources.bash
+++ b/utils/glued-download-sources.bash
@@ -1,7 +1,7 @@
 #! /bin/bash
 ###########################################################################
 # GLUED: GNU/Linux Uniform Environment Distribution                       #
-# Copyright (C) 2007-2017 Universidade do Porto - Faculdade de Engenharia #
+# Copyright (C) 2007-2013 Universidade do Porto - Faculdade de Engenharia #
 # Laboratório de Sistemas e Tecnologia Subaquática (LSTS)                 #
 ###########################################################################
 # This program is free software; you can redistribute it and/or modify    #
Author	SHA1	Message	Date
tsmarques	0064fc968f	rules/vlc/default: Fixed compilation errors by updating version and disabling missing dependencies.	2017-01-14 15:19:34 +00:00
tsmarques	77e1fc14e3	rules/x264/default: Added missing configuration options.	2017-01-14 15:19:34 +00:00
tsmarques	b4c331ca14	rules/vlc/default: Target compiler was not being found.	2017-01-14 15:19:34 +00:00
tsmarques	5b84d7069a	rules/vlc/default: Added missing dependency.	2017-01-14 15:19:34 +00:00